add allow_ddm_traffic to PortConfig

Author: andrewjstone

dev-tools/rack-init-config/src/lib.rs

@@ -147,6 +147,7 @@ mod tests {
             autoneg: false,
             lldp: Some(lldp("uplink-0")),
             tx_eq: None,
+            allow_ddm_traffic: false,
         };
         RackInitializeRequest {
             trust_quorum_peers: Some(trust_quorum_peers()),
@@ -217,6 +218,7 @@ mod tests {
             autoneg: false,
             lldp: Some(lldp("uplink-0")),
             tx_eq: None,
+            allow_ddm_traffic: false,
         };
         let mut request = static_bfd_request();
         request.rack_network_config = RackNetworkConfig {

nexus/mgs-updates/src/test_util/host_phase_2_test_state.rs

@@ -278,6 +278,7 @@ mod api_impl {
     use sled_agent_types_versions::v33;
     use sled_agent_types_versions::v39;
     use sled_agent_types_versions::v42;
+    use sled_agent_types_versions::v46;
     use sled_diagnostics::SledDiagnosticsQueryOutput;
     use std::collections::BTreeMap;
     use std::collections::BTreeSet;
@@ -772,6 +773,13 @@ mod api_impl {
             unimplemented!()
         }
 
+        async fn write_network_bootstore_config_v46(
+            _rqctx: RequestContext<Self::Context>,
+            _body: TypedBody<v46::system_networking::WriteNetworkConfigRequest>,
+        ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+            unimplemented!()
+        }
+
         async fn write_network_bootstore_config_v42(
             _rqctx: RequestContext<Self::Context>,
             _body: TypedBody<v42::system_networking::WriteNetworkConfigRequest>,

nexus/switch-config/src/lib.rs

@@ -460,6 +460,7 @@ pub fn build_rack_network_config(
                     management_addrs: c.management_ip.map(|ip| vec![ip]),
                 }),
             tx_eq,
+            allow_ddm_traffic: false,
         };
 
         ports.push(port_config);

openapi/bootstrap-agent-lockstep.json

@@ -1353,6 +1353,11 @@
               "$ref": "#/components/schemas/UplinkAddressConfig"
             }
           },
+          "allow_ddm_traffic": {
+            "description": "Whether or not to allow DDM traffic on this port",
+            "default": false,
+            "type": "boolean"
+          },
           "autoneg": {
             "description": "Whether or not to set autonegotiation",
             "default": false,

openapi/nexus-lockstep.json

@@ -8249,6 +8249,11 @@
               "$ref": "#/components/schemas/UplinkAddressConfig"
             }
           },
+          "allow_ddm_traffic": {
+            "description": "Whether or not to allow DDM traffic on this port",
+            "default": false,
+            "type": "boolean"
+          },
           "autoneg": {
             "description": "Whether or not to set autonegotiation",
             "default": false,

openapi/sled-agent/sled-agent-45.0.0-264d85.json.gitstub

@@ -0,0 +1 @@
+1a20a12eb13a20c58f91dfae51bb3c4836b4e069:openapi/sled-agent/sled-agent-45.0.0-264d85.json

…sled-agent/sled-agent-45.0.0-264d85.json …sled-agent/sled-agent-46.0.0-59eec2.jsonopenapi/sled-agent/sled-agent-45.0.0-264d85.json renamed to openapi/sled-agent/sled-agent-46.0.0-59eec2.json openapi/sled-agent/sled-agent-45.0.0-264d85.json renamed to openapi/sled-agent/sled-agent-46.0.0-59eec2.json

@@ -7,7 +7,7 @@
       "url": "https://oxide.computer",
       "email": "api@oxide.computer"
     },
-    "version": "45.0.0"
+    "version": "46.0.0"
   },
   "paths": {
     "/artifacts": {
@@ -8264,6 +8264,11 @@
               "$ref": "#/components/schemas/UplinkAddressConfig"
             }
           },
+          "allow_ddm_traffic": {
+            "description": "Whether or not to allow DDM traffic on this port",
+            "default": false,
+            "type": "boolean"
+          },
           "autoneg": {
             "description": "Whether or not to set autonegotiation",
             "default": false,

openapi/sled-agent/sled-agent-latest.json

@@ -1 +1 @@
-sled-agent-45.0.0-264d85.json
+sled-agent-46.0.0-59eec2.json

sled-agent/api/src/lib.rs

@@ -22,6 +22,7 @@ use omicron_common::api::internal::{
 use sled_agent_types_versions::{
     latest, v1, v4, v6, v7, v9, v10, v11, v12, v14, v16, v17, v18, v20, v22,
     v24, v25, v26, v28, v29, v30, v31, v32, v33, v34, v37, v39, v40, v41, v42,
+    v46,
 };
 use sled_diagnostics::SledDiagnosticsQueryOutput;
 use slog_error_chain::InlineErrorChain;
@@ -38,6 +39,7 @@ api_versions!([
     // |  example for the next person.
     // v
     // (next_int, IDENT),
+    (46, ALLOW_DDM_TRAFFIC),
     (45, REMOVE_UPLINK_ENSURE),
     (44, PROPOLIS_NVME_VWC),
     (43, INVENTORY_BASEBOARD_ID),
@@ -994,7 +996,7 @@ pub trait SledAgentApi {
     // -------------------------------------------------------------------------
     fn static_assert_latest_write_network_config_type() {
         static_assertions::assert_type_eq_all!(
-            v42::system_networking::WriteNetworkConfigRequest,
+            v46::system_networking::WriteNetworkConfigRequest,
             latest::system_networking::WriteNetworkConfigRequest
         );
     }
@@ -1004,7 +1006,20 @@ pub trait SledAgentApi {
     #[endpoint {
         method = PUT,
         path = "/network-bootstore-config",
-        versions = VERSION_NON_EMPTY_UPLINK_PORTS..,
+        versions = VERSION_ALLOW_DDM_TRAFFIC..,
+        operation_id = "write_network_bootstore_config",
+    }]
+    async fn write_network_bootstore_config_v46(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<v46::system_networking::WriteNetworkConfigRequest>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError>;
+
+    // As described above, this must not forward to newer versions; sled-agent
+    // must implement this by faithfully serializing the requested version.
+    #[endpoint {
+        method = PUT,
+        path = "/network-bootstore-config",
+        versions = VERSION_NON_EMPTY_UPLINK_PORTS..VERSION_ALLOW_DDM_TRAFFIC,
         operation_id = "write_network_bootstore_config",
     }]
     async fn write_network_bootstore_config_v42(

sled-agent/bootstrap-agent-lockstep-types/examples/multirack_join_request.rs

@@ -79,6 +79,7 @@ fn main() {
                 system_description: None,
                 management_addrs: None,
             }),
+            allow_ddm_traffic: false,
         }])
         .expect("port list is non-empty"),
         bgp: vec![BgpConfig {