omdb support for showing devices visible to MGS (#4162)

oxidecomputer · Oct 6, 2023 · 230637a · 230637a
1 parent c76ca69
commit 230637a
Show file tree

Hide file tree

Showing 11 changed files with 697 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/gateway-client/src/lib.rs b/clients/gateway-client/src/lib.rs
@@ -48,7 +48,7 @@ progenitor::generate_api!(
     }),
     derives = [schemars::JsonSchema],
     patch = {
-        SpIdentifier = { derives = [Copy, PartialEq, Hash, Eq, PartialOrd, Ord, Serialize, Deserialize] },
+        SpIdentifier = { derives = [Copy, PartialEq, Hash, Eq, Serialize, Deserialize] },
         SpIgnition = { derives = [PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize] },
         SpIgnitionSystemType = { derives = [Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize] },
         SpState = { derives = [ PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize] },
@@ -59,3 +59,17 @@ progenitor::generate_api!(
         HostPhase2RecoveryImageId = { derives = [ PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize] },
     },
 );
+
+// Override the impl of Ord for SpIdentifier because the default one orders the
+// fields in a different order than people are likely to want.
+impl Ord for crate::types::SpIdentifier {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.type_.cmp(&other.type_).then(self.slot.cmp(&other.slot))
+    }
+}
+
+impl PartialOrd for crate::types::SpIdentifier {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
diff --git a/dev-tools/omdb/Cargo.toml b/dev-tools/omdb/Cargo.toml
@@ -14,9 +14,12 @@ chrono.workspace = true
 clap.workspace = true
 diesel.workspace = true
 dropshot.workspace = true
+futures.workspace = true
+gateway-client.workspace = true
+gateway-messages.workspace = true
+gateway-test-utils.workspace = true
 humantime.workspace = true
 internal-dns.workspace = true
-futures.workspace = true
 nexus-client.workspace = true
 nexus-db-model.workspace = true
 nexus-db-queries.workspace = true

diff --git a/dev-tools/omdb/src/bin/omdb/main.rs b/dev-tools/omdb/src/bin/omdb/main.rs
@@ -41,6 +41,7 @@ use std::net::SocketAddr;
 use std::net::SocketAddrV6;
 
 mod db;
+mod mgs;
 mod nexus;
 mod oximeter;
 mod sled_agent;
@@ -57,6 +58,7 @@ async fn main() -> Result<(), anyhow::Error> {
 
     match &args.command {
         OmdbCommands::Db(db) => db.run_cmd(&args, &log).await,
+        OmdbCommands::Mgs(mgs) => mgs.run_cmd(&args, &log).await,
         OmdbCommands::Nexus(nexus) => nexus.run_cmd(&args, &log).await,
         OmdbCommands::Oximeter(oximeter) => oximeter.run_cmd(&log).await,
         OmdbCommands::SledAgent(sled) => sled.run_cmd(&args, &log).await,
@@ -155,6 +157,8 @@ impl Omdb {
 enum OmdbCommands {
     /// Query the control plane database (CockroachDB)
     Db(db::DbArgs),
+    /// Debug a specific Management Gateway Service instance
+    Mgs(mgs::MgsArgs),
     /// Debug a specific Nexus instance
     Nexus(nexus::NexusArgs),
     /// Query oximeter collector state