[sp-sim] configurable initial contents of the cabooses

dev-tools/mgs-dev/Cargo.toml

@@ -9,6 +9,7 @@ workspace = true
 
 [dependencies]
 anyhow.workspace = true
+camino.workspace = true
 clap.workspace = true
 futures.workspace = true
 gateway-messages.workspace = true

dev-tools/mgs-dev/src/main.rs

@@ -4,8 +4,10 @@
 
 //! Developer tool for running MGS.
 
+use camino::Utf8PathBuf;
 use clap::{Args, Parser, Subcommand};
 use futures::StreamExt;
+use gateway_test_utils::setup::DEFAULT_SP_SIM_CONFIG;
 use libc::SIGINT;
 use signal_hook_tokio::Signals;
 use std::net::SocketAddr;
@@ -43,6 +45,9 @@ struct MgsRunArgs {
     /// Oximeter producer.
     #[clap(long)]
     nexus_address: Option<SocketAddr>,
+    /// Override the sp-sim configuration file.
+    #[clap(long, default_value = DEFAULT_SP_SIM_CONFIG)]
+    sp_sim_config_file: Utf8PathBuf,
 }
 
 impl MgsRunArgs {
@@ -54,7 +59,9 @@ impl MgsRunArgs {
 
         println!("mgs-dev: setting up MGS ... ");
         let (mut mgs_config, sp_sim_config) =
-            gateway_test_utils::setup::load_test_config();
+            gateway_test_utils::setup::load_test_config(
+                self.sp_sim_config_file.clone(),
+            );
         if let Some(addr) = self.nexus_address {
             mgs_config.metrics =
                 Some(gateway_test_utils::setup::MetricsConfig {

dev-tools/omicron-dev/Cargo.toml

@@ -12,9 +12,11 @@ omicron-rpaths.workspace = true
 
 [dependencies]
 anyhow.workspace = true
+camino.workspace = true
 clap.workspace = true
 dropshot.workspace = true
 futures.workspace = true
+gateway-test-utils.workspace = true
 libc.workspace = true
 nexus-config.workspace = true
 nexus-test-interface.workspace = true

dev-tools/omicron-dev/src/main.rs

@@ -3,8 +3,10 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use anyhow::Context;
+use camino::Utf8PathBuf;
 use clap::{Args, Parser, Subcommand};
 use futures::StreamExt;
+use gateway_test_utils::setup::DEFAULT_SP_SIM_CONFIG;
 use libc::SIGINT;
 use nexus_config::NexusConfig;
 use nexus_test_interface::NexusServer;
@@ -45,6 +47,9 @@ struct RunAllArgs {
     /// Nexus external API listen port.  Use `0` to request any available port.
     #[clap(long, action)]
     nexus_listen_port: Option<u16>,
+    /// Override the gateway server configuration file.
+    #[clap(long, default_value = DEFAULT_SP_SIM_CONFIG)]
+    gateway_config: Utf8PathBuf,
 }
 
 impl RunAllArgs {
@@ -77,7 +82,7 @@ impl RunAllArgs {
         println!("omicron-dev: setting up all services ... ");
         let cptestctx = nexus_test_utils::omicron_dev_setup_with_config::<
             omicron_nexus::Server,
-        >(&mut config, 0)
+        >(&mut config, 0, self.gateway_config.clone())
         .await
         .context("error setting up services")?;