feat(api): Added support for automatic prefix selection by VPC ID

crates/admin-cli/src/instance/show/cmd.rs

@@ -263,9 +263,51 @@ async fn convert_instance_to_nice_format(
                             Some(
                                 forgerpc::instance_interface_config::NetworkDetails::VpcPrefixId(x),
                             ) => x.to_string().into(),
+                            Some(forgerpc::instance_interface_config::NetworkDetails::Vpc(_)) => {
+                                "Automatic VPC selection".into()
+                            }
                             None => "NA".into(),
                         },
                     ),
+                    (
+                        "REQUESTED VPC ID",
+                        match if_config.and_then(|c| c.network_details.as_ref()) {
+                            Some(forgerpc::instance_interface_config::NetworkDetails::Vpc(
+                                selection,
+                            )) => selection
+                                .vpc_id
+                                .map(|vpc_id| vpc_id.to_string().into())
+                                .unwrap_or_else(|| "NA".into()),
+                            _ => "NA".into(),
+                        },
+                    ),
+                    (
+                        "REQUESTED IP FAMILY",
+                        match if_config.and_then(|c| c.network_details.as_ref()) {
+                            Some(forgerpc::instance_interface_config::NetworkDetails::Vpc(
+                                selection,
+                            )) => selection.family_mode().as_str_name().into(),
+                            _ => "NA".into(),
+                        },
+                    ),
+                    (
+                        "RESOLVED IPV4 PREFIX",
+                        status
+                            .resolved_vpc_prefixes
+                            .as_ref()
+                            .and_then(|resolved| resolved.ipv4_vpc_prefix_id)
+                            .map(|id| id.to_string().into())
+                            .unwrap_or_else(|| "NA".into()),
+                    ),
+                    (
+                        "RESOLVED IPV6 PREFIX",
+                        status
+                            .resolved_vpc_prefixes
+                            .as_ref()
+                            .and_then(|resolved| resolved.ipv6_vpc_prefix_id)
+                            .map(|id| id.to_string().into())
+                            .unwrap_or_else(|| "NA".into()),
+                    ),
                     (
                         "MAC ADDR",
                         status

crates/agent/src/tests/full.rs

@@ -815,6 +815,7 @@ async fn handle_netconf(AxumState(state): AxumState<Arc<Mutex<State>>>) -> impl
                     device: None,
                     device_instance: 0u32,
                     vpc_id: None,
+                    resolved_vpc_prefixes: None,
                 }],
                 configs_synced: rpc::SyncState::Synced.into(),
             }),

crates/api-core/src/handlers/instance.rs

@@ -40,7 +40,7 @@ use model::dpa_interface::DpaSearchConfig;
 use model::instance::config::InstanceConfig;
 use model::instance::config::extension_services::InstanceExtensionServicesConfig;
 use model::instance::config::infiniband::InstanceInfinibandConfig;
-use model::instance::config::network::{InstanceNetworkConfig, NetworkDetails};
+use model::instance::config::network::InstanceNetworkConfig;
 use model::instance::config::nvlink::InstanceNvLinkConfig;
 use model::instance::config::spx::InstanceSpxConfig;
 use model::instance::config::tenant_config::TenantConfig;
@@ -1506,8 +1506,8 @@ async fn update_instance_network_config(
     // Copy the resources if same interface and network are mentioned.
     network.copy_existing_resources(&instance.config.network);
 
-    // Allocate network segment here if vpc_prefix_id is mentioned before validate.
-    allocate_network(network, txn).await?;
+    // Resolve prefix-backed network resources before validating the generated segment IDs.
+    allocate_network(network, &instance.config.tenant.tenant_organization_id, txn).await?;
     network
         .validate(allow_instance_vf)
         .map_err(CarbideError::from)?;
@@ -1730,29 +1730,25 @@ pub async fn force_delete_instance(
             .new_config
             .interfaces
             .iter()
-            .filter_map(|x| match &x.network_details {
-                Some(NetworkDetails::VpcPrefixId(_)) => x.network_segment_id,
-                _ => None,
-            })
+            .filter_map(|x| x.generated_network_segment_id())
             .collect_vec();
         network_segment_ids_with_vpc.extend(
             update_network_req
                 .old_config
                 .interfaces
                 .iter()
-                .filter_map(|x| match &x.network_details {
-                    Some(NetworkDetails::VpcPrefixId(_)) => x.network_segment_id,
-                    _ => None,
-                }),
+                .filter_map(|x| x.generated_network_segment_id()),
         );
     }
 
-    network_segment_ids_with_vpc.extend(instance.config.network.interfaces.iter().filter_map(
-        |x| match &x.network_details {
-            Some(NetworkDetails::VpcPrefixId(_)) => x.network_segment_id,
-            _ => None,
-        },
-    ));
+    network_segment_ids_with_vpc.extend(
+        instance
+            .config
+            .network
+            .interfaces
+            .iter()
+            .filter_map(|x| x.generated_network_segment_id()),
+    );
 
     let network_segments_set: std::collections::HashSet<::carbide_uuid::network::NetworkSegmentId> =
         network_segment_ids_with_vpc.drain(..).collect();