add transit_ips to NIC create params

Author: david-crespo

nexus/src/app/sagas/instance_create.rs

@@ -599,6 +599,7 @@ async fn create_default_primary_network_interface(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: None, // Request an IP address allocation
+        transit_ips: vec![],
     };
 
     // Lookup authz objects, used in the call to actually create the NIC.

nexus/tests/integration_tests/endpoints.rs

@@ -533,6 +533,7 @@ pub static DEMO_INSTANCE_NIC_CREATE: Lazy<
     vpc_name: DEMO_VPC_NAME.clone(),
     subnet_name: DEMO_VPC_SUBNET_NAME.clone(),
     ip: None,
+    transit_ips: vec![],
 });
 pub static DEMO_INSTANCE_NIC_PUT: Lazy<params::InstanceNetworkInterfaceUpdate> =
     Lazy::new(|| params::InstanceNetworkInterfaceUpdate {

nexus/tests/integration_tests/instances.rs

@@ -2178,6 +2178,7 @@ async fn test_instance_create_saga_removes_instance_database_record(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: Some(requested_address),
+        transit_ips: vec![],
     };
     let interface_params =
         params::InstanceNetworkInterfaceAttachment::Create(vec![
@@ -2257,6 +2258,7 @@ async fn test_instance_create_saga_removes_instance_database_record(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: Some(requested_address),
+        transit_ips: vec![],
     };
     let interface_params =
         params::InstanceNetworkInterfaceAttachment::Create(vec![
@@ -2299,6 +2301,7 @@ async fn test_instance_with_single_explicit_ip_address(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: Some(requested_address),
+        transit_ips: vec![],
     };
     let interface_params =
         params::InstanceNetworkInterfaceAttachment::Create(vec![
@@ -2407,6 +2410,7 @@ async fn test_instance_with_new_custom_network_interfaces(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: None,
+        transit_ips: vec![],
     };
     let if1_params = params::InstanceNetworkInterfaceCreate {
         identity: IdentityMetadataCreateParams {
@@ -2416,6 +2420,7 @@ async fn test_instance_with_new_custom_network_interfaces(
         vpc_name: default_name.clone(),
         subnet_name: non_default_subnet_name.clone(),
         ip: None,
+        transit_ips: vec![],
     };
     let interface_params =
         params::InstanceNetworkInterfaceAttachment::Create(vec![
@@ -2594,6 +2599,7 @@ async fn test_instance_create_delete_network_interface(
             vpc_name: "default".parse().unwrap(),
             subnet_name: "default".parse().unwrap(),
             ip: Some("172.30.0.10".parse().unwrap()),
+            transit_ips: vec![],
         },
         params::InstanceNetworkInterfaceCreate {
             identity: IdentityMetadataCreateParams {
@@ -2603,6 +2609,7 @@ async fn test_instance_create_delete_network_interface(
             vpc_name: "default".parse().unwrap(),
             subnet_name: secondary_subnet.identity.name.clone(),
             ip: Some("172.31.0.11".parse().unwrap()),
+            transit_ips: vec![],
         },
     ];
 
@@ -2829,6 +2836,7 @@ async fn test_instance_update_network_interfaces(
             vpc_name: "default".parse().unwrap(),
             subnet_name: "default".parse().unwrap(),
             ip: Some("172.30.0.10".parse().unwrap()),
+            transit_ips: vec![],
         },
         params::InstanceNetworkInterfaceCreate {
             identity: IdentityMetadataCreateParams {
@@ -2838,6 +2846,7 @@ async fn test_instance_update_network_interfaces(
             vpc_name: "default".parse().unwrap(),
             subnet_name: secondary_subnet.identity.name.clone(),
             ip: Some("172.31.0.11".parse().unwrap()),
+            transit_ips: vec![],
         },
     ];
 
@@ -3171,6 +3180,7 @@ async fn test_instance_with_multiple_nics_unwinds_completely(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: Some("172.30.0.6".parse().unwrap()),
+        transit_ips: vec![],
     };
     let if1_params = params::InstanceNetworkInterfaceCreate {
         identity: IdentityMetadataCreateParams {
@@ -3180,6 +3190,7 @@ async fn test_instance_with_multiple_nics_unwinds_completely(
         vpc_name: default_name.clone(),
         subnet_name: default_name.clone(),
         ip: Some("172.30.0.7".parse().unwrap()),
+        transit_ips: vec![],
     };
     let interface_params =
         params::InstanceNetworkInterfaceAttachment::Create(vec![

nexus/tests/integration_tests/internet_gateway.rs

@@ -372,6 +372,7 @@ async fn test_setup(c: &ClientTestContext) {
             ip: None,
             subnet_name: "default".parse().unwrap(),
             vpc_name: VPC_NAME.parse().unwrap(),
+            transit_ips: vec![],
         },
     ]);
     let _inst = create_instance_with(

nexus/tests/integration_tests/subnet_allocation.rs

@@ -47,6 +47,7 @@ async fn create_instance_expect_failure(
                 vpc_name: "default".parse().unwrap(),
                 subnet_name: subnet_name.parse().unwrap(),
                 ip: None,
+                transit_ips: vec![],
             },
         ]);
     let new_instance = params::InstanceCreate {
@@ -132,6 +133,7 @@ async fn test_subnet_allocation(cptestctx: &ControlPlaneTestContext) {
             vpc_name: "default".parse().unwrap(),
             subnet_name: "small".parse().unwrap(),
             ip: None,
+            transit_ips: vec![],
         },
     ]);
 

nexus/tests/integration_tests/vpc_routers.rs

@@ -507,6 +507,7 @@ async fn test_vpc_routers_custom_delivered_to_instance(
                     vpc_name: vpc.name().clone(),
                     subnet_name: subnet_name.parse().unwrap(),
                     ip: Some(format!("192.168.{i}.10").parse().unwrap()),
+                    transit_ips: vec![],
                 },
             ]),
             vec![],

nexus/types/src/external_api/params.rs

@@ -825,6 +825,9 @@ pub struct InstanceNetworkInterfaceCreate {
     pub subnet_name: Name,
     /// The IP address for the interface. One will be auto-assigned if not provided.
     pub ip: Option<IpAddr>,
+    /// A set of additional networks that this interface may send and
+    /// receive traffic on
+    pub transit_ips: Vec<IpNet>,
 }
 
 /// Parameters for updating an `InstanceNetworkInterface`
@@ -853,7 +856,7 @@ pub struct InstanceNetworkInterfaceUpdate {
     pub primary: bool,
 
     /// A set of additional networks that this interface may send and
-    /// receive traffic on.
+    /// receive traffic on
     #[serde(default)]
     pub transit_ips: Vec<IpNet>,
 }

openapi/nexus.json

@@ -16281,6 +16281,13 @@
               }
             ]
           },
+          "transit_ips": {
+            "description": "A set of additional networks that this interface may send and receive traffic on",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/IpNet"
+            }
+          },
           "vpc_name": {
             "description": "The VPC in which to create the interface.",
             "allOf": [
@@ -16294,6 +16301,7 @@
           "description",
           "name",
           "subnet_name",
+          "transit_ips",
           "vpc_name"
         ]
       },
@@ -16340,7 +16348,7 @@
             "type": "boolean"
           },
           "transit_ips": {
-            "description": "A set of additional networks that this interface may send and receive traffic on.",
+            "description": "A set of additional networks that this interface may send and receive traffic on",
             "default": [],
             "type": "array",
             "items": {