MGMT-16330: disable SDN for 4.15 and above

Signed-off-by: Riccardo Piccoli <rpiccoli@redhat.com>

internal/featuresupport/feature_support_level.go

@@ -25,6 +25,8 @@ var featuresList = map[models.FeatureSupportLevelID]SupportLevelFeature{
 	models.FeatureSupportLevelIDDUALSTACKVIPS:             (&DualStackVipsFeature{}).New(),
 	models.FeatureSupportLevelIDDUALSTACK:                 (&DualStackFeature{}).New(),
 	models.FeatureSupportLevelIDPLATFORMMANAGEDNETWORKING: (&PlatformManagedNetworkingFeature{}).New(),
+	models.FeatureSupportLevelIDSDNNETWORKING: (&SDNNetworkingFeature{}).New(),
+	models.FeatureSupportLevelIDOVNNETWORKING: (&OVNNetworkingFeature{}).New(),
 
 	// Olm Operators features
 	models.FeatureSupportLevelIDLVM: (&LvmFeature{}).New(),

internal/featuresupport/feature_support_test.go

@@ -170,6 +170,24 @@ var _ = Describe("V2ListFeatureSupportLevels API", func() {
 		})
 	})
 
+	Context("Test network type", func() {
+		It("Test SDN not supported over 4.15", func() {
+			feature := models.FeatureSupportLevelIDSDNNETWORKING
+			arch := "DoesNotMatter"
+			Expect(IsFeatureAvailable(feature, "4.14", swag.String(arch))).To(Equal(true))
+			Expect(IsFeatureAvailable(feature, "4.15", swag.String(arch))).To(Equal(false))
+			Expect(IsFeatureAvailable(feature, "4.16", swag.String(arch))).To(Equal(false))
+		})
+
+		It("Test OVN is supported over 4.15", func() {
+			feature := models.FeatureSupportLevelIDOVNNETWORKING
+			arch := "DoesNotMatter"
+			Expect(IsFeatureAvailable(feature, "4.14", swag.String(arch))).To(Equal(true))
+			Expect(IsFeatureAvailable(feature, "4.15", swag.String(arch))).To(Equal(true))
+			Expect(IsFeatureAvailable(feature, "4.16", swag.String(arch))).To(Equal(true))
+		})
+	})
+
 	Context("GetCpuArchitectureSupportList", func() {
 		It("GetCpuArchitectureSupportList for openshift version 4.6", func() {
 			openshiftVersion := "4.6"
@@ -206,19 +224,19 @@ var _ = Describe("V2ListFeatureSupportLevels API", func() {
 			When("GetFeatureSupportList 4.12 with Platform", func() {
 				It(string(*filters.PlatformType)+" "+swag.StringValue(filters.ExternalPlatformName), func() {
 					list := GetFeatureSupportList("dummy", nil, filters.PlatformType, filters.ExternalPlatformName)
-					Expect(len(list)).To(Equal(17))
+					Expect(len(list)).To(Equal(19))
 				})
 			})
 		}
 
 		It("GetFeatureSupportList 4.12", func() {
 			list := GetFeatureSupportList("4.12", nil, nil, nil)
-			Expect(len(list)).To(Equal(22))
+			Expect(len(list)).To(Equal(24))
 		})
 
 		It("GetFeatureSupportList 4.13", func() {
 			list := GetFeatureSupportList("4.13", nil, nil, nil)
-			Expect(len(list)).To(Equal(22))
+			Expect(len(list)).To(Equal(24))
 		})
 
 		It("GetCpuArchitectureSupportList 4.12", func() {

internal/featuresupport/features_networking.go

@@ -348,3 +348,84 @@ func (feature *PlatformManagedNetworkingFeature) getFeatureActiveLevel(cluster *
 
 	return activeLevelNotActive
 }
+
+// SDNNetworkingFeature
+type SDNNetworkingFeature struct {}
+
+func (feature *SDNNetworkingFeature) New() SupportLevelFeature {
+	return &SDNNetworkingFeature{}
+}
+
+func (feature *SDNNetworkingFeature) getId() models.FeatureSupportLevelID {
+	return models.FeatureSupportLevelIDSDNNETWORKING
+}
+
+func (feature *SDNNetworkingFeature) GetName() string {
+	return "Openshift SDN"
+}
+
+func (feature *SDNNetworkingFeature) getSupportLevel(filters SupportLevelFilters) models.SupportLevel {
+	if isAvailable, err := common.BaseVersionLessThan("4.15", filters.OpenshiftVersion); err == nil && isAvailable {
+		return models.SupportLevelSupported
+	}
+	return models.SupportLevelUnavailable
+}
+
+func (feature *SDNNetworkingFeature) getFeatureActiveLevel(cluster *common.Cluster, _ *models.InfraEnv, clusterUpdateParams *models.V2ClusterUpdateParams, _ *models.InfraEnvUpdateParams) featureActiveLevel {
+	if cluster == nil || cluster.NetworkType == nil {
+		return activeLevelNotActive
+	}
+	if *cluster.NetworkType == models.ClusterNetworkTypeOpenShiftSDN {
+		return activeLevelActive
+	}
+	return activeLevelNotActive
+}
+
+func (feature *SDNNetworkingFeature) getIncompatibleArchitectures(openshiftVersion *string) *[]models.ArchitectureSupportLevelID {
+	return &[]models.ArchitectureSupportLevelID{}
+}
+
+func (feature *SDNNetworkingFeature) getIncompatibleFeatures(string) *[]models.FeatureSupportLevelID {
+	return &[]models.FeatureSupportLevelID{
+		models.FeatureSupportLevelIDOVNNETWORKING,
+	}
+}
+
+// OVNNetworkingFeature
+type OVNNetworkingFeature struct {}
+
+func (feature *OVNNetworkingFeature) New() SupportLevelFeature {
+	return &OVNNetworkingFeature{}
+}
+
+func (feature *OVNNetworkingFeature) getId() models.FeatureSupportLevelID {
+	return models.FeatureSupportLevelIDOVNNETWORKING
+}
+
+func (feature *OVNNetworkingFeature) GetName() string {
+	return "Openshift OVN"
+}
+
+func (feature *OVNNetworkingFeature) getSupportLevel(filters SupportLevelFilters) models.SupportLevel {
+	return models.SupportLevelSupported
+}
+
+func (feature *OVNNetworkingFeature) getFeatureActiveLevel(cluster *common.Cluster, _ *models.InfraEnv, clusterUpdateParams *models.V2ClusterUpdateParams, _ *models.InfraEnvUpdateParams) featureActiveLevel {
+	if cluster == nil || cluster.NetworkType == nil {
+		return activeLevelNotActive
+	}
+	if *cluster.NetworkType == models.ClusterNetworkTypeOVNKubernetes {
+		return activeLevelActive
+	}
+	return activeLevelNotActive
+}
+
+func (feature *OVNNetworkingFeature) getIncompatibleArchitectures(openshiftVersion *string) *[]models.ArchitectureSupportLevelID {
+	return &[]models.ArchitectureSupportLevelID{}
+}
+
+func (feature *OVNNetworkingFeature) getIncompatibleFeatures(string) *[]models.FeatureSupportLevelID {
+	return &[]models.FeatureSupportLevelID{
+		models.FeatureSupportLevelIDSDNNETWORKING,
+	}
+}

swagger.yaml

@@ -4119,6 +4119,8 @@ definitions:
       - 'PLATFORM_MANAGED_NETWORKING'
       - 'SKIP_MCO_REBOOT'
       - 'EXTERNAL_PLATFORM'
+      - 'OVN_NETWORKING'
+      - 'SDN_NETWORKING'
 
   architecture-support-level-id:
     type: string