prototype Omicron debugger (oxidecomputer#4084)

jmpesp · Sep 14, 2023 · aceb744 · aceb744
1 parent 980c5be
commit aceb744
Show file tree

Hide file tree

Showing 24 changed files with 1,437 additions and 119 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,6 +37,7 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -97,6 +98,7 @@ default-members = [
     "nexus/db-queries",
     "nexus/defaults",
     "nexus/types",
+    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -151,7 +153,7 @@ chacha20poly1305 = "0.10.1"
 ciborium = "0.2.1"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
-clap = { version = "4.4", features = ["derive"] }
+clap = { version = "4.4", features = ["derive", "env"] }
 cookie = "0.16"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
@@ -233,6 +235,7 @@ omicron-common = { path = "common" }
 omicron-dev-tools = { path = "dev-tools" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
+omicron-omdb = { path = "omdb" }
 omicron-package = { path = "package" }
 omicron-rpaths = { path = "rpaths" }
 omicron-sled-agent = { path = "sled-agent" }
@@ -330,6 +333,7 @@ strum = { version = "0.25", features = [ "derive" ] }
 subprocess = "0.2.9"
 libsw = { version = "3.3.0", features = ["tokio"] }
 syn = { version = "2.0" }
+tabled = "0.14"
 tar = "0.4"
 tempdir = "0.3"
 tempfile = "3.6"

diff --git a/common/src/api/external/mod.rs b/common/src/api/external/mod.rs
@@ -683,6 +683,7 @@ impl TryFrom<i64> for Generation {
 pub enum ResourceType {
     AddressLot,
     AddressLotBlock,
+    BackgroundTask,
     Fleet,
     Silo,
     SiloUser,

diff --git a/dev-tools/src/bin/omicron-dev.rs b/dev-tools/src/bin/omicron-dev.rs
@@ -39,7 +39,7 @@ async fn main() -> Result<(), anyhow::Error> {
     Ok(())
 }
 
-/// Manage a local CockroachDB database for Omicron development
+/// Tools for working with a local Omicron deployment
 #[derive(Debug, Parser)]
 #[clap(version)]
 enum OmicronDb {

diff --git a/dev-tools/tests/output/cmd-omicron-dev-noargs-stderr b/dev-tools/tests/output/cmd-omicron-dev-noargs-stderr
@@ -1,4 +1,4 @@
-Manage a local CockroachDB database for Omicron development
+Tools for working with a local Omicron deployment
 
 Usage: omicron-dev <COMMAND>
 

diff --git a/nexus-client/src/lib.rs b/nexus-client/src/lib.rs
@@ -246,6 +246,12 @@ impl From<std::time::Duration> for types::Duration {
     }
 }
 
+impl From<types::Duration> for std::time::Duration {
+    fn from(s: types::Duration) -> Self {
+        std::time::Duration::from_nanos(s.secs * 1000000000 + s.nanos as u64)
+    }
+}
+
 impl From<omicron_common::address::IpRange> for types::IpRange {
     fn from(r: omicron_common::address::IpRange) -> Self {
         use omicron_common::address::IpRange;

diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
@@ -9,6 +9,7 @@ omicron-rpaths.workspace = true
 
 [dependencies]
 anyhow.workspace = true
+assert_matches.workspace = true
 async-trait.workspace = true
 base64.workspace = true
 bb8.workspace = true
@@ -91,7 +92,6 @@ oximeter-producer.workspace = true
 rustls = { workspace = true }
 
 [dev-dependencies]
-assert_matches.workspace = true
 async-bb8-diesel.workspace = true
 criterion.workspace = true
 diesel.workspace = true

diff --git a/nexus/db-model/Cargo.toml b/nexus/db-model/Cargo.toml
@@ -26,6 +26,7 @@ semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 steno.workspace = true
+strum.workspace = true
 uuid.workspace = true
 
 db-macros.workspace = true
@@ -38,4 +39,3 @@ sled-agent-client.workspace = true
 
 [dev-dependencies]
 expectorate.workspace = true
-strum.workspace = true
diff --git a/nexus/db-model/src/service_kind.rs b/nexus/db-model/src/service_kind.rs
@@ -6,13 +6,14 @@ use super::impl_enum_type;
 use external_api::shared::ServiceUsingCertificate;
 use nexus_types::{external_api, internal_api};
 use serde::{Deserialize, Serialize};
+use strum::EnumIter;
 
 impl_enum_type!(
     #[derive(Clone, SqlType, Debug, QueryId)]
     #[diesel(postgres_type(name = "service_kind"))]
     pub struct ServiceKindEnum;
 
-    #[derive(Clone, Copy, Debug, Eq, AsExpression, FromSqlRow, Serialize, Deserialize, PartialEq)]
+    #[derive(Clone, Copy, Debug, Eq, AsExpression, FromSqlRow, Serialize, Deserialize, PartialEq, EnumIter)]
     #[diesel(sql_type = ServiceKindEnum)]
     pub enum ServiceKind;
 

diff --git a/nexus/db-model/src/sled.rs b/nexus/db-model/src/sled.rs
@@ -109,6 +109,10 @@ impl Sled {
     pub fn address_with_port(&self, port: u16) -> SocketAddrV6 {
         SocketAddrV6::new(self.ip(), port, 0, 0)
     }
+
+    pub fn serial_number(&self) -> &str {
+        &self.serial_number
+    }
 }
 
 impl From<Sled> for views::Sled {

diff --git a/nexus/db-queries/Cargo.toml b/nexus/db-queries/Cargo.toml
@@ -78,7 +78,7 @@ petgraph.workspace = true
 rcgen.workspace = true
 regex.workspace = true
 rustls.workspace = true
+strum.workspace = true
 subprocess.workspace = true
 tempfile.workspace = true
 term.workspace = true
-strum.workspace = true