the great type migration continues

Author: rcgoodfellow

Cargo.lock

@@ -1,9 +1,9 @@
 Bootstrap Agent (client: bootstrap-agent-client)
     consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
-    consumed by: wicketd (omicron/wicketd) via 2 paths
+    consumed by: wicketd (omicron/wicketd) via 1 path
 
 Bootstrap Agent Lockstep API (client: bootstrap-agent-lockstep-client)
-    consumed by: wicketd (omicron/wicketd) via 1 path
+    consumed by: wicketd (omicron/wicketd) via 2 paths
 
 Clickhouse Cluster Admin for Keepers (client: clickhouse-admin-keeper-client)
     consumed by: omicron-nexus (omicron/nexus) via 3 paths

dev-tools/ls-apis/tests/api_dependencies.out

@@ -722,7 +722,7 @@
         "description": "Password hashes must be in PHC (Password Hashing Competition) string format.  Passwords must be hashed with Argon2id.  Password hashes may be rejected if the parameters appear not to be secure enough.",
         "type": "string"
       },
-      "PortConfigV2": {
+      "PortConfig": {
         "type": "object",
         "properties": {
           "addresses": {
@@ -909,7 +909,7 @@
             "description": "Initial rack network configuration.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/RackNetworkConfigV2"
+                "$ref": "#/components/schemas/RackNetworkConfig"
               }
             ]
           },
@@ -942,7 +942,7 @@
           "recovery_silo"
         ]
       },
-      "RackNetworkConfigV2": {
+      "RackNetworkConfig": {
         "description": "Initial network configuration",
         "type": "object",
         "properties": {
@@ -975,7 +975,7 @@
             "description": "Uplinks for connecting the rack to external networks",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/PortConfigV2"
+              "$ref": "#/components/schemas/PortConfig"
             }
           },
           "rack_subnet": {

openapi/bootstrap-agent-lockstep.json

@@ -7281,7 +7281,7 @@
           "waiting_zones"
         ]
       },
-      "PortConfigV2": {
+      "PortConfig": {
         "type": "object",
         "properties": {
           "addresses": {
@@ -7834,7 +7834,7 @@
             "description": "Initial rack network configuration",
             "allOf": [
               {
-                "$ref": "#/components/schemas/RackNetworkConfigV2"
+                "$ref": "#/components/schemas/RackNetworkConfig"
               }
             ]
           },
@@ -7869,7 +7869,7 @@
           "zpools"
         ]
       },
-      "RackNetworkConfigV2": {
+      "RackNetworkConfig": {
         "description": "Initial network configuration",
         "type": "object",
         "properties": {
@@ -7902,7 +7902,7 @@
             "description": "Uplinks for connecting the rack to external networks",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/PortConfigV2"
+              "$ref": "#/components/schemas/PortConfig"
             }
           },
           "rack_subnet": {

openapi/nexus-lockstep.json

@@ -7703,7 +7703,7 @@
         }
       },
       "UserSpecifiedPortConfig": {
-        "description": "User-specified version of [`PortConfigV2`].\n\nAll of [`PortConfigV2`] is user-specified. But we expect the port name to be a key, rather than a field as in [`PortConfigV2`]. So this has all of the fields other than the port name.\n\n[`PortConfigV2`]: omicron_common::api::internal::shared::PortConfigV2",
+        "description": "User-specified version of [`PortConfig`].\n\nAll of [`PortConfig`] is user-specified. But we expect the port name to be a key, rather than a field as in [`PortConfig`]. So this has all of the fields other than the port name.\n\n[`PortConfigV2`]: omicron_common::api::internal::shared::PortConfigV2",
         "type": "object",
         "properties": {
           "addresses": {

openapi/wicketd.json

@@ -13,7 +13,7 @@ use omicron_sled_agent::bootstrap::RssAccessError;
 use omicron_sled_agent::bootstrap::server as bootstrap_server;
 use omicron_sled_agent::config::Config as SledConfig;
 use sled_agent_types::rack_init::{
-    RackInitializeRequest, RackInitializeRequestParams,
+    RackInitializeRequestParams, rack_initialize_request_from_file,
 };
 
 #[derive(Debug, Parser)]
@@ -64,7 +64,7 @@ async fn do_run() -> Result<(), CmdError> {
             };
             let rss_config = if rss_config_path.exists() {
                 let rss_config =
-                    RackInitializeRequest::from_file(rss_config_path)
+                    rack_initialize_request_from_file(rss_config_path)
                         .map_err(|e| CmdError::Failure(anyhow!(e)))?;
                 let skip_timesync = config.skip_timesync.unwrap_or(false);
                 Some(RackInitializeRequestParams::new(

sled-agent/src/bin/sled-agent.rs

@@ -867,14 +867,14 @@ impl ServiceInner {
 
         let rack_network_config = {
             let config = &config.rack_network_config;
-            NexusTypes::RackNetworkConfigV2 {
+            NexusTypes::RackNetworkConfig {
                 rack_subnet: config.rack_subnet,
                 infra_ip_first: config.infra_ip_first,
                 infra_ip_last: config.infra_ip_last,
                 ports: config
                     .ports
                     .iter()
-                    .map(|config| NexusTypes::PortConfigV2 {
+                    .map(|config| NexusTypes::PortConfig {
                         port: config.port.clone(),
                         routes: config
                             .routes
@@ -1728,6 +1728,7 @@ mod test {
         Inventory, InventoryDisk, OmicronZoneType, SledCpuFamily, SledRole,
         ZoneImageResolverInventory,
     };
+    use sled_agent_types::rack_init::rack_initialize_request_test_config;
 
     fn make_sled_info(
         sled_id: SledUuid,
@@ -1803,7 +1804,7 @@ mod test {
     }
 
     fn make_test_service_plan() -> ServicePlan {
-        let rss_config = Config::test_config();
+        let rss_config = rack_initialize_request_test_config();
         let fake_sleds = make_fake_sleds();
         let service_plan =
             ServicePlan::create_transient(&rss_config, fake_sleds)
@@ -1934,7 +1935,7 @@ mod test {
 
         let fake_sleds = make_fake_sleds();
 
-        let rss_config = Config::test_config();
+        let rss_config = rack_initialize_request_test_config();
         let service_plan =
             ServicePlan::create_transient(&rss_config, fake_sleds)
                 .expect("created service plan");

sled-agent/src/rack_setup/service.rs

@@ -28,7 +28,7 @@ use nexus_config::NUM_INITIAL_RESERVED_IP_ADDRESSES;
 use nexus_lockstep_client::types::{
     AllowedSourceIps, CrucibleDatasetCreateRequest, ExternalPortDiscovery,
     IpRange, Ipv4Range, Ipv6Range, RackInitializationRequest,
-    RackNetworkConfigV2,
+    RackNetworkConfig,
 };
 use nexus_types::deployment::{
     BlueprintPhysicalDiskConfig, BlueprintPhysicalDiskDisposition,
@@ -635,7 +635,7 @@ pub async fn run_standalone_server(
         external_dns_zone_name: DNS_ZONE_EXTERNAL_TESTING.to_owned(),
         recovery_silo,
         external_port_count: ExternalPortDiscovery::Static(HashMap::new()),
-        rack_network_config: RackNetworkConfigV2 {
+        rack_network_config: RackNetworkConfig {
             rack_subnet: Ipv6Net::host_net(Ipv6Addr::LOCALHOST),
             infra_ip_first: Ipv4Addr::LOCALHOST,
             infra_ip_last: Ipv4Addr::LOCALHOST,