cleanup

oxidecomputer · Sep 28, 2023 · 8297492 · 8297492
1 parent d3b85af
commit 8297492
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 156 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev-tools/omdb/Cargo.toml b/dev-tools/omdb/Cargo.toml
@@ -16,6 +16,8 @@ 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
 nexus-client.workspace = true

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