Type fixes for nexus

oxidecomputer · Oct 17, 2023 · 8e56948 · 8e56948
1 parent af9ba38
commit 8e56948
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 14 deletions.
diff --git a/nexus/src/app/rack.rs b/nexus/src/app/rack.rs
@@ -43,9 +43,10 @@ use omicron_common::api::external::Name;
 use omicron_common::api::external::NameOrId;
 use omicron_common::api::external::SwitchLocation;
 use omicron_common::api::internal::shared::ExternalPortDiscovery;
+use sled_agent_client::types::EarlyNetworkConfigBody;
 use sled_agent_client::types::{
     BgpConfig, BgpPeerConfig, EarlyNetworkConfig, PortConfigV1,
-    RackNetworkConfig, RouteConfig as SledRouteConfig,
+    RackNetworkConfigV1, RouteConfig as SledRouteConfig,
 };
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
@@ -596,7 +597,7 @@ impl super::Nexus {
             .into_inner();
 
         rack.rack_subnet =
-            result.rack_network_config.map(|x| x.rack_subnet.into());
+            result.body.rack_network_config.map(|x| x.rack_subnet.into());
 
         self.datastore().rack_insert(opctx, &rack).await?;
 
@@ -696,16 +697,19 @@ impl super::Nexus {
 
         let result = EarlyNetworkConfig {
             generation: 0,
-            ntp_servers: Vec::new(), //TODO
-            rack_network_config: Some(RackNetworkConfig {
-                rack_subnet: subnet,
-                //TODO(ry) you are here. We need to remove these too. They are
-                // inconsistent with a generic set of addresses on ports.
-                infra_ip_first: Ipv4Addr::UNSPECIFIED,
-                infra_ip_last: Ipv4Addr::UNSPECIFIED,
-                ports,
-                bgp,
-            }),
+            schema_version: 1,
+            body: EarlyNetworkConfigBody {
+                ntp_servers: Vec::new(), //TODO
+                rack_network_config: Some(RackNetworkConfigV1 {
+                    rack_subnet: subnet,
+                    //TODO(ry) you are here. We need to remove these too. They are
+                    // inconsistent with a generic set of addresses on ports.
+                    infra_ip_first: Ipv4Addr::UNSPECIFIED,
+                    infra_ip_last: Ipv4Addr::UNSPECIFIED,
+                    ports,
+                    bgp,
+                }),
+            },
         };
 
         Ok(result)

diff --git a/nexus/src/app/sagas/switch_port_settings_apply.rs b/nexus/src/app/sagas/switch_port_settings_apply.rs
@@ -952,7 +952,7 @@ pub(crate) fn apply_bootstore_update(
 ) -> Result<BootstoreNetworkPortChange, ActionError> {
     let mut change = BootstoreNetworkPortChange::default();
 
-    let rack_net_config = match &mut config.rack_network_config {
+    let rack_net_config = match &mut config.body.rack_network_config {
         Some(cfg) => cfg,
         None => {
             return Err(ActionError::action_failed(

diff --git a/nexus/src/app/switch_port.rs b/nexus/src/app/switch_port.rs
@@ -25,7 +25,7 @@ use omicron_common::api::external::{
 use sled_agent_client::types::BgpConfig;
 use sled_agent_client::types::BgpPeerConfig;
 use sled_agent_client::types::{
-    EarlyNetworkConfig, PortConfigV1, RackNetworkConfig, RouteConfig,
+    EarlyNetworkConfig, PortConfigV1, RackNetworkConfigV1, RouteConfig,
 };
 use std::sync::Arc;
 use uuid::Uuid;

diff --git a/sled-agent/src/bootstrap/early_networking.rs b/sled-agent/src/bootstrap/early_networking.rs
@@ -738,3 +738,22 @@ fn convert_fec(fec: &PortFec) -> dpd_client::types::PortFec {
         PortFec::Rs => dpd_client::types::PortFec::Rs,
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn serialized_early_network_config_v0_to_v1_conversion() {
+        let v0 = EarlyNetworkConfigV0 {
+            generation: 1,
+            rack_subnet: Ipv6Addr::UNSPECIFIED,
+            ntp_servers: Vec::new(),
+            rack_network_config: Some(RackNetworkConfigV0 {
+                infra_ip_first: Ipv4Addr::UNSPECIFIED,
+                infra_ip_last: Ipv4Addr::UNSPECIFIED,
+                uplinks: vec![],
+            }),
+        };
+    }
+}