Use new external customer trait (#681)

Author: SoWieMarkus

helm/bundles/cortex-nova/templates/pipelines_kvm.yaml

@@ -51,7 +51,7 @@ spec:
       description: |
         This step prefix-matches the domain name for external customer domains and
         filters out hosts that are not intended for external customers. It considers
-        the `CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED` trait on hosts as well as the
+        the `CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE` trait on hosts as well as the
         `domain_name` scheduler hint from the nova request spec.
       params:
         - {key: domainNamePrefixes, stringListValue: ["iaas-"]}
@@ -190,7 +190,7 @@ spec:
       description: |
         This step prefix-matches the domain name for external customer domains and
         filters out hosts that are not intended for external customers. It considers
-        the `CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED` trait on hosts as well as the
+        the `CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE` trait on hosts as well as the
         `domain_name` scheduler hint from the nova request spec.
       params:
         - {key: domainNamePrefixes, stringListValue: ["iaas-"]}
@@ -463,7 +463,7 @@ spec:
       description: |
         This step prefix-matches the domain name for external customer domains and
         filters out hosts that are not intended for external customers. It considers
-        the `CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED` trait on hosts as well as the
+        the `CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE` trait on hosts as well as the
         `domain_name` scheduler hint from the nova request spec.
       params:
         - {key: domainNamePrefixes, stringListValue: ["iaas-"]}
@@ -534,7 +534,7 @@ spec:
       description: |
         This step prefix-matches the domain name for external customer domains and
         filters out hosts that are not intended for external customers. It considers
-        the `CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED` trait on hosts as well as the
+        the `CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE` trait on hosts as well as the
         `domain_name` scheduler hint from the nova request spec.
       params:
         - {key: domainNamePrefixes, stringListValue: ["iaas-"]}

internal/knowledge/extractor/plugins/compute/host_details.sql

@@ -35,7 +35,7 @@ SELECT
         ELSE false
     END AS decommissioned,
     CASE
-        WHEN ht.traits LIKE '%CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED%' THEN true
+        WHEN ht.traits LIKE '%CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE%' THEN true
         ELSE false
     END AS external_customer,
     CASE

internal/knowledge/extractor/plugins/compute/host_details_test.go

@@ -80,7 +80,7 @@ func TestHostDetailsExtractor_Extract(t *testing.T) {
 		// VMware host traits
 		&placement.Trait{ResourceProviderUUID: "uuid1", Name: "CUSTOM_HW_SAPPHIRE_RAPIDS"},
 		&placement.Trait{ResourceProviderUUID: "uuid1", Name: "CUSTOM_HANA_EXCLUSIVE_HOST"},
-		&placement.Trait{ResourceProviderUUID: "uuid1", Name: "CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED"},
+		&placement.Trait{ResourceProviderUUID: "uuid1", Name: "CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE"},
 		// KVM host traits
 		&placement.Trait{ResourceProviderUUID: "uuid2", Name: "CUSTOM_NUMASIZE_C48_M729"},
 		// Ironic host traits

internal/knowledge/kpis/plugins/compute/resource_capacity_kvm.go

@@ -277,7 +277,7 @@ func hostLabelsFromHypervisor(hypervisor hv1.Hypervisor) kvmHostLabels {
 			workloadType = "hana"
 		case "CUSTOM_DECOMMISSIONING":
 			decommissioned = true
-		case "CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED":
+		case "CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE":
 			externalCustomer = true
 		}
 	}

internal/knowledge/kpis/plugins/compute/resource_capacity_kvm_test.go

@@ -379,7 +379,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
 						},
 						Traits: []string{
 							"CUSTOM_DECOMMISSIONING",
-							"CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED",
+							"CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE",
 						},
 					},
 				},

internal/scheduling/nova/plugins/filters/filter_external_customer.go

@@ -65,7 +65,7 @@ func (s *FilterExternalCustomerStep) Run(traceLog *slog.Logger, request api.Exte
 	for _, hv := range hvs.Items {
 		traits := hv.Status.Traits
 		traits = append(traits, hv.Spec.CustomTraits...)
-		if !slices.Contains(traits, "CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED") {
+		if !slices.Contains(traits, "CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE") {
 			continue
 		}
 		hvsWithTrait[hv.Name] = struct{}{}

internal/scheduling/nova/plugins/filters/filter_external_customer_test.go

@@ -26,15 +26,15 @@ func TestFilterExternalCustomerStep_Run(t *testing.T) {
 				Name: "host1",
 			},
 			Status: hv1.HypervisorStatus{
-				Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED"},
+				Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE"},
 			},
 		},
 		&hv1.Hypervisor{
 			ObjectMeta: v1.ObjectMeta{
 				Name: "host2",
 			},
 			Status: hv1.HypervisorStatus{
-				Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED", "SOME_OTHER_TRAIT"},
+				Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE", "SOME_OTHER_TRAIT"},
 			},
 		},
 		&hv1.Hypervisor{
@@ -58,7 +58,7 @@ func TestFilterExternalCustomerStep_Run(t *testing.T) {
 				Name: "host5",
 			},
 			Status: hv1.HypervisorStatus{
-				Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_SUPPORTED"},
+				Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE"},
 			},
 		},
 	}