fix tests where mode is not configured

openshift · Mar 18, 2024 · 511aebf · 511aebf
1 parent a7d84d5
commit 511aebf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/internal/featuresupport/features_misc.go b/internal/featuresupport/features_misc.go
@@ -63,8 +63,10 @@ func (feature *SnoFeature) getIncompatibleArchitectures(openshiftVersion *string
 }
 
 func (feature *SnoFeature) getFeatureActiveLevel(cluster *common.Cluster, _ *models.InfraEnv, _ *models.V2ClusterUpdateParams, _ *models.InfraEnvUpdateParams) featureActiveLevel {
-	if cluster != nil && swag.StringValue(cluster.HighAvailabilityMode) == models.ClusterHighAvailabilityModeNone {
-		return activeLevelActive
+	if cluster != nil && cluster.HighAvailabilityMode != nil {
+		if *cluster.HighAvailabilityMode == models.ClusterHighAvailabilityModeNone {
+			return activeLevelActive
+		}
 	}
 	return activeLevelNotActive
 }

diff --git a/internal/featuresupport/features_networking.go b/internal/featuresupport/features_networking.go
@@ -95,8 +95,10 @@ func (feature *ClusterManagedNetworkingFeature) getSupportLevel(filters SupportL
 	if !isFeatureCompatibleWithArchitecture(feature, filters.OpenshiftVersion, swag.StringValue(filters.CPUArchitecture)) {
 		return models.SupportLevelUnavailable
 	}
-	if *filters.HighAvailabilityMode == models.ClusterHighAvailabilityModeNone {
-		return models.SupportLevelUnavailable
+	if filters.HighAvailabilityMode != nil {
+		if *filters.HighAvailabilityMode == models.ClusterHighAvailabilityModeNone {
+			return models.SupportLevelUnavailable
+		}
 	}
 	if swag.StringValue(filters.CPUArchitecture) == models.ClusterCPUArchitectureArm64 {
 		isNotAvailable, err := common.BaseVersionLessThan("4.11", filters.OpenshiftVersion)

diff --git a/subsystem/feature_support_levels_test.go b/subsystem/feature_support_levels_test.go
@@ -262,11 +262,7 @@ var _ = Describe("Feature support levels API", func() {
 					Expect(err).ShouldNot(HaveOccurred())
 
 					for featureID, supportLevel := range response.Payload.Features {
-						filters := featuresupport.SupportLevelFilters{
-              OpenshiftVersion: version, 
-              CPUArchitecture: swag.String(arch),
-              HighAvailabilityMode: swag.String(""),
-            }
+						filters := featuresupport.SupportLevelFilters{OpenshiftVersion: version, CPUArchitecture: swag.String(arch)}
 						featureSupportLevel := featuresupport.GetSupportLevel(models.FeatureSupportLevelID(featureID), filters)
 						Expect(featureSupportLevel).To(BeEquivalentTo(supportLevel))
 					}

diff --git a/subsystem/kubeapi_test.go b/subsystem/kubeapi_test.go
@@ -1369,7 +1369,7 @@ var _ = Describe("[kube-api]cluster installation", func() {
 		}, "2m", "2s").Should(Equal(0))
 	})
 
-	It("deploy external platform", func() {
+	FIt("deploy external platform", func() {
 		By("Upload CCM manifests for OCI")
 		name := "cloud-controller-manager"
 		namespace := fmt.Sprintf("oci-%s", name)