fix(core): address power policy review feedback

Signed-off-by: Patrice Breton <pbreton@nvidia.com>

Author: pbreton

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

@@ -176,6 +176,7 @@ pub(crate) async fn update(
     // against the VPC's persisted tenant and virtualization type.
     if vpc_update.network_security_group_id.is_some()
         || vpc_update.routing_profile_overrides.is_some()
+        || vpc_update.power_resource_group.is_some()
     {
         let Some(vpc) = db::vpc::find_by(
             &mut txn,

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

@@ -248,6 +248,10 @@ pub(crate) struct InstanceAllocationRequest {
     pub(crate) allow_unhealthy_machine: bool,
 }
 
+fn normalize_created_power_profile(power_profile: Option<String>) -> Option<String> {
+    power_profile.filter(|profile| !profile.is_empty())
+}
+
 impl TryFrom<rpc::InstanceAllocationRequest> for InstanceAllocationRequest {
     type Error = CarbideError;
 
@@ -268,7 +272,10 @@ impl TryFrom<rpc::InstanceAllocationRequest> for InstanceAllocationRequest {
             .config
             .ok_or(RpcDataConversionError::MissingArgument("config"))?;
 
-        let config = InstanceConfig::try_from(config)?;
+        let mut config = InstanceConfig::try_from(config)?;
+        // Empty power-policy values are clear sentinels only on update. During
+        // creation there is no association to clear, so persist them as unset.
+        config.power_profile = normalize_created_power_profile(config.power_profile);
 
         // If the Tenant provides an instance ID use this one
         // Otherwise create a random ID
@@ -2381,6 +2388,22 @@ mod tests {
 
     use super::*;
 
+    #[test]
+    fn instance_creation_power_profile_semantics() {
+        value_scenarios!(
+            run = |power_profile| normalize_created_power_profile(power_profile);
+            "non-empty profile is preserved" {
+                Some("balanced".to_string()) => Some("balanced".to_string()),
+            }
+            "empty profile is treated as unset" {
+                Some(String::new()) => None,
+            }
+            "omitted profile remains unset" {
+                None => None,
+            }
+        );
+    }
+
     #[test]
     fn build_requested_linknet_prefix_accepts_host_end_rejects_dpu_end() {
         // The host must take the odd (::1) end of the linknet; the even end is the

crates/api-core/src/tests/vpc.rs

@@ -376,6 +376,23 @@ async fn create_vpc(pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>
 
     let no_org_vpc_id: VpcId = no_org_vpc.id.expect("should have id");
 
+    // A power-resource-group-only update still validates that the VPC exists.
+    let unknown_vpc_id = VpcId::from(uuid::Uuid::new_v4());
+    let status = env
+        .api
+        .update_vpc(tonic::Request::new(rpc::forge::VpcUpdateRequest {
+            id: Some(unknown_vpc_id),
+            if_version_match: None,
+            metadata: None,
+            network_security_group_id: None,
+            default_nvlink_logical_partition_id: None,
+            routing_profile_overrides: None,
+            power_resource_group: Some("power-group".to_string()),
+        }))
+        .await
+        .expect_err("updating an unknown VPC should fail");
+    assert_eq!(status.code(), tonic::Code::NotFound);
+
     // Try to update to invalid metadata
     for (invalid_metadata, expected_err) in common::metadata::invalid_metadata_testcases(true) {
         let invalid_updated_vpc = env

…0806120001_power_provisioning_policy.sql …0814015021_power_provisioning_policy.sqlcrates/api-db/migrations/20260806120001_power_provisioning_policy.sql renamed to crates/api-db/migrations/20260814015021_power_provisioning_policy.sql crates/api-db/migrations/20260806120001_power_provisioning_policy.sql renamed to crates/api-db/migrations/20260814015021_power_provisioning_policy.sql

@@ -1746,7 +1746,9 @@ message VpcConfig {
   optional uint32 vni = 6;
   optional string routing_profile_type = 7;
   optional VpcRoutingProfileOverrides routing_profile_overrides = 8;
-  // Resource group managed by the external power provisioning service.
+  // Resource group managed by the external power provisioning service. Unset
+  // means that the VPC has no associated resource group; empty values are not
+  // persisted.
   optional string power_resource_group = 9;
 }
 
@@ -1853,7 +1855,8 @@ message VpcCreationRequest {
   // Properties to overlay on the selected named routing profile. Properties
   // left unset inherit from the base profile.
   optional VpcRoutingProfileOverrides routing_profile_overrides = 18;
-  // Resource group managed by the external power provisioning service.
+  // Resource group managed by the external power provisioning service. During
+  // creation, omission or an empty value creates no association.
   optional string power_resource_group = 19;
 }
 
@@ -3125,7 +3128,8 @@ message InstanceConfig {
 
   InstanceSpxConfig spxconfig = 25;
 
-  // Power profile managed by the external power provisioning service. In an
+  // Power profile managed by the external power provisioning service. During
+  // creation, omission or an empty value creates no association. In an
   // InstanceConfigUpdateRequest, omission preserves the current profile for
   // compatibility with older clients, an empty string explicitly clears it,
   // and a non-empty value replaces it.

crates/rpc/proto/forge.proto

@@ -268,7 +268,9 @@ impl TryFrom<rpc::forge::VpcCreationRequest> for NewVpc {
                 .routing_profile_overrides
                 .map(TryInto::try_into)
                 .transpose()?,
-            power_resource_group: value.power_resource_group,
+            power_resource_group: value
+                .power_resource_group
+                .filter(|resource_group| !resource_group.is_empty()),
             network_virtualization_type: virt_type,
             metadata,
         })
@@ -480,6 +482,30 @@ mod tests {
         assert_eq!(omitted.power_resource_group, None);
     }
 
+    #[test]
+    fn vpc_creation_power_resource_group_semantics() {
+        value_scenarios!(
+            run = |power_resource_group| {
+                NewVpc::try_from(rpc::forge::VpcCreationRequest {
+                    tenant_organization_id: "tenant-1".to_string(),
+                    power_resource_group,
+                    ..Default::default()
+                })
+                .expect("creation request should be valid")
+                .power_resource_group
+            };
+            "non-empty resource group is preserved" {
+                Some("power-group".to_string()) => Some("power-group".to_string()),
+            }
+            "empty resource group is treated as unset" {
+                Some(String::new()) => None,
+            }
+            "omitted resource group remains unset" {
+                None => None,
+            }
+        );
+    }
+
     // `VpcSearchFilter::from` is a total conversion, so we project its output to
     // the fields the originals asserted: name, tenant_org_id, and the label as its
     // (key, value) pair (None when no label is present).

crates/rpc/src/model/vpc.rs

@@ -1688,7 +1688,9 @@ message VpcConfig {
   optional uint32 vni = 6;
   optional string routing_profile_type = 7;
   optional VpcRoutingProfileOverrides routing_profile_overrides = 8;
-  // Resource group managed by the external power provisioning service.
+  // Resource group managed by the external power provisioning service. Unset
+  // means that the VPC has no associated resource group; empty values are not
+  // persisted.
   optional string power_resource_group = 9;
 }
 
@@ -1793,7 +1795,8 @@ message VpcCreationRequest {
   // Properties to overlay on the selected named routing profile. Properties
   // left unset inherit from the base profile.
   optional VpcRoutingProfileOverrides routing_profile_overrides = 18;
-  // Resource group managed by the external power provisioning service.
+  // Resource group managed by the external power provisioning service. During
+  // creation, omission or an empty value creates no association.
   optional string power_resource_group = 19;
 }
 
@@ -3027,7 +3030,8 @@ message InstanceConfig {
 
   InstanceSpxConfig spxconfig = 25;
 
-  // Power profile managed by the external power provisioning service. In an
+  // Power profile managed by the external power provisioning service. During
+  // creation, omission or an empty value creates no association. In an
   // InstanceConfigUpdateRequest, omission preserves the current profile for
   // compatibility with older clients, an empty string explicitly clears it,
   // and a non-empty value replaces it.