Add v20230701preview API changes for NSG Enhancement

Azure · Jul 5, 2023 · dd94bb2 · dd94bb2
1 parent d82d4f5
commit dd94bb2
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 15 deletions.
diff --git a/.sha256sum b/.sha256sum
@@ -3,4 +3,4 @@
 239c63228da1db172f298cd81d0c3cc0d52ecca907915efe61be98c42b6d8f1d  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json
 1d167031baf0209fe8c46df9654585c64e8cc9a0c89555d7479c4ed6dc150251  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json
 622404e8311c62f27fba778e30e760bb1901e5bd221b23de72f449cafbdf0c45  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-04-01/redhatopenshift.json
-4df3ebacaf35d77d09f5eab75fb9608241929b6ef8d00fb506455cd38e383640  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
+daab3ae0f3e21da0c63fd3f5a895d090cba06374c7e6912444cd82e834a773d6  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
diff --git a/pkg/api/openshiftclusterdocument_example.go b/pkg/api/openshiftclusterdocument_example.go
@@ -50,8 +50,9 @@ func ExampleOpenShiftClusterDocument() *OpenShiftClusterDocument {
 					ClientID:     "clientId",
 				},
 				NetworkProfile: NetworkProfile{
-					PodCIDR:     "10.128.0.0/14",
-					ServiceCIDR: "172.30.0.0/16",
+					PodCIDR:          "10.128.0.0/14",
+					ServiceCIDR:      "172.30.0.0/16",
+					PreconfiguredNSG: PreconfiguredNSGDisabled,
 				},
 				MasterProfile: MasterProfile{
 					VMSize:   VMSizeStandardD8sV3,

diff --git a/pkg/api/v20230701preview/openshiftcluster.go b/pkg/api/v20230701preview/openshiftcluster.go
@@ -143,8 +143,20 @@ type NetworkProfile struct {
 
 	// The OutboundType used for egress traffic.
 	OutboundType OutboundType `json:"outboundType,omitempty"`
+
+	// Specifies whether subnets are pre-attached with an NSG
+	PreconfiguredNSG PreconfiguredNSG `json:"preconfiguredNSG,omitempty"`
 }
 
+// PreconfiguredNSG represents whether customers want to use their own NSG attached to the subnets
+type PreconfiguredNSG string
+
+// PreconfiguredNSG constants
+const (
+	PreconfiguredNSGEnabled  PreconfiguredNSG = "Enabled"
+	PreconfiguredNSGDisabled PreconfiguredNSG = "Disabled"
+)
+
 // EncryptionAtHost represents encryption at host state
 type EncryptionAtHost string
 

diff --git a/pkg/api/v20230701preview/openshiftcluster_convert.go b/pkg/api/v20230701preview/openshiftcluster_convert.go
@@ -36,9 +36,10 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 				ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),
 			},
 			NetworkProfile: NetworkProfile{
-				PodCIDR:      oc.Properties.NetworkProfile.PodCIDR,
-				ServiceCIDR:  oc.Properties.NetworkProfile.ServiceCIDR,
-				OutboundType: OutboundType(oc.Properties.NetworkProfile.OutboundType),
+				PodCIDR:          oc.Properties.NetworkProfile.PodCIDR,
+				ServiceCIDR:      oc.Properties.NetworkProfile.ServiceCIDR,
+				OutboundType:     OutboundType(oc.Properties.NetworkProfile.OutboundType),
+				PreconfiguredNSG: PreconfiguredNSG(oc.Properties.NetworkProfile.PreconfiguredNSG),
 			},
 			MasterProfile: MasterProfile{
 				VMSize:              VMSize(oc.Properties.MasterProfile.VMSize),

diff --git a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go
diff --git a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/models.go b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/models.go
diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/__init__.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/__init__.py
@@ -92,6 +92,7 @@
     EncryptionAtHost,
     FipsValidatedModules,
     OutboundType,
+    PreconfiguredNSG,
     ProvisioningState,
     Visibility,
 )
@@ -136,6 +137,7 @@
     'EncryptionAtHost',
     'FipsValidatedModules',
     'OutboundType',
+    'PreconfiguredNSG',
     'ProvisioningState',
     'Visibility',
 ]
diff --git a/...mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py b/...mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py
@@ -47,6 +47,13 @@ class OutboundType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
     LOADBALANCER = "Loadbalancer"
     USER_DEFINED_ROUTING = "UserDefinedRouting"
 
+class PreconfiguredNSG(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
+    """PreconfiguredNSG represents whether customers want to use their own NSG attached to the subnets
+    """
+
+    DISABLED = "Disabled"
+    ENABLED = "Enabled"
+
 class ProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
     """ProvisioningState represents a provisioning state.
     """

diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py
@@ -502,12 +502,17 @@ class NetworkProfile(msrest.serialization.Model):
      "Loadbalancer", "UserDefinedRouting".
     :vartype outbound_type: str or
      ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType
+    :ivar preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible
+     values include: "Disabled", "Enabled".
+    :vartype preconfigured_nsg: str or
+     ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG
     """
 
     _attribute_map = {
         'pod_cidr': {'key': 'podCidr', 'type': 'str'},
         'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
         'outbound_type': {'key': 'outboundType', 'type': 'str'},
+        'preconfigured_nsg': {'key': 'preconfiguredNSG', 'type': 'str'},
     }
 
     def __init__(
@@ -523,11 +528,16 @@ def __init__(
          "Loadbalancer", "UserDefinedRouting".
         :paramtype outbound_type: str or
          ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType
+        :keyword preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible
+         values include: "Disabled", "Enabled".
+        :paramtype preconfigured_nsg: str or
+         ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG
         """
         super(NetworkProfile, self).__init__(**kwargs)
         self.pod_cidr = kwargs.get('pod_cidr', None)
         self.service_cidr = kwargs.get('service_cidr', None)
         self.outbound_type = kwargs.get('outbound_type', None)
+        self.preconfigured_nsg = kwargs.get('preconfigured_nsg', None)
 
 
 class TrackedResource(Resource):

diff --git a/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py b/python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py
@@ -545,12 +545,17 @@ class NetworkProfile(msrest.serialization.Model):
      "Loadbalancer", "UserDefinedRouting".
     :vartype outbound_type: str or
      ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType
+    :ivar preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible
+     values include: "Disabled", "Enabled".
+    :vartype preconfigured_nsg: str or
+     ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG
     """
 
     _attribute_map = {
         'pod_cidr': {'key': 'podCidr', 'type': 'str'},
         'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
         'outbound_type': {'key': 'outboundType', 'type': 'str'},
+        'preconfigured_nsg': {'key': 'preconfiguredNSG', 'type': 'str'},
     }
 
     def __init__(
@@ -559,6 +564,7 @@ def __init__(
         pod_cidr: Optional[str] = None,
         service_cidr: Optional[str] = None,
         outbound_type: Optional[Union[str, "OutboundType"]] = None,
+        preconfigured_nsg: Optional[Union[str, "PreconfiguredNSG"]] = None,
         **kwargs
     ):
         """
@@ -570,11 +576,16 @@ def __init__(
          "Loadbalancer", "UserDefinedRouting".
         :paramtype outbound_type: str or
          ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.OutboundType
+        :keyword preconfigured_nsg: Specifies whether subnets are pre-attached with an NSG. Possible
+         values include: "Disabled", "Enabled".
+        :paramtype preconfigured_nsg: str or
+         ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.PreconfiguredNSG
         """
         super(NetworkProfile, self).__init__(**kwargs)
         self.pod_cidr = pod_cidr
         self.service_cidr = service_cidr
         self.outbound_type = outbound_type
+        self.preconfigured_nsg = preconfigured_nsg
 
 
 class TrackedResource(Resource):

diff --git a/...RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_CreateOrUpdate.json b/...RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_CreateOrUpdate.json
@@ -23,7 +23,8 @@
         },
         "networkProfile": {
           "podCidr": "10.128.0.0/14",
-          "serviceCidr": "172.30.0.0/16"
+          "serviceCidr": "172.30.0.0/16",
+          "preconfiguredNSG": "Disabled"
         },
         "masterProfile": {
           "vmSize": "Standard_D8s_v3",
@@ -84,7 +85,8 @@
           },
           "networkProfile": {
             "podCidr": "10.128.0.0/14",
-            "serviceCidr": "172.30.0.0/16"
+            "serviceCidr": "172.30.0.0/16",
+            "preconfiguredNSG": "Disabled"
           },
           "masterProfile": {
             "vmSize": "Standard_D8s_v3",
@@ -146,7 +148,8 @@
           },
           "networkProfile": {
             "podCidr": "10.128.0.0/14",
-            "serviceCidr": "172.30.0.0/16"
+            "serviceCidr": "172.30.0.0/16",
+            "preconfiguredNSG": "Disabled"
           },
           "masterProfile": {
             "vmSize": "Standard_D8s_v3",

diff --git a/.../Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Get.json b/.../Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Get.json
@@ -38,7 +38,8 @@
           },
           "networkProfile": {
             "podCidr": "10.128.0.0/14",
-            "serviceCidr": "172.30.0.0/16"
+            "serviceCidr": "172.30.0.0/16",
+            "preconfiguredNSG": "Disabled"
           },
           "masterProfile": {
             "vmSize": "Standard_D8s_v3",

diff --git a/...Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_List.json b/...Microsoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_List.json
@@ -38,7 +38,8 @@
               },
               "networkProfile": {
                 "podCidr": "10.128.0.0/14",
-                "serviceCidr": "172.30.0.0/16"
+                "serviceCidr": "172.30.0.0/16",
+                "preconfiguredNSG": "Disabled"
               },
               "masterProfile": {
                 "vmSize": "Standard_D8s_v3",

diff --git a/...tOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_ListByResourceGroup.json b/...tOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_ListByResourceGroup.json
@@ -39,7 +39,8 @@
               },
               "networkProfile": {
                 "podCidr": "10.128.0.0/14",
-                "serviceCidr": "172.30.0.0/16"
+                "serviceCidr": "172.30.0.0/16",
+                "preconfiguredNSG": "Disabled"
               },
               "masterProfile": {
                 "vmSize": "Standard_D8s_v3",

diff --git a/...crosoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Update.json b/...crosoft.RedHatOpenShift/preview/2023-07-01-preview/examples/OpenShiftClusters_Update.json
@@ -22,7 +22,8 @@
         },
         "networkProfile": {
           "podCidr": "10.128.0.0/14",
-          "serviceCidr": "172.30.0.0/16"
+          "serviceCidr": "172.30.0.0/16",
+          "preconfiguredNSG": "Disabled"
         },
         "masterProfile": {
           "vmSize": "Standard_D8s_v3",
@@ -83,7 +84,8 @@
           },
           "networkProfile": {
             "podCidr": "10.128.0.0/14",
-            "serviceCidr": "172.30.0.0/16"
+            "serviceCidr": "172.30.0.0/16",
+            "preconfiguredNSG": "Disabled"
           },
           "masterProfile": {
             "vmSize": "Standard_D8s_v3",
@@ -145,7 +147,8 @@
           },
           "networkProfile": {
             "podCidr": "10.128.0.0/14",
-            "serviceCidr": "172.30.0.0/16"
+            "serviceCidr": "172.30.0.0/16",
+            "preconfiguredNSG": "Disabled"
           },
           "masterProfile": {
             "vmSize": "Standard_D8s_v3",

diff --git a/...esource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json b/...esource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
@@ -1989,6 +1989,10 @@
         "outboundType": {
           "$ref": "#/definitions/OutboundType",
           "description": "The OutboundType used for egress traffic."
+        },
+        "preconfiguredNSG": {
+          "$ref": "#/definitions/PreconfiguredNSG",
+          "description": "Specifies whether subnets are pre-attached with an NSG"
         }
       }
     },
@@ -2219,6 +2223,14 @@
       ],
       "type": "string"
     },
+    "PreconfiguredNSG": {
+      "description": "PreconfiguredNSG represents whether customers want to use their own NSG attached to the subnets",
+      "enum": [
+        "Disabled",
+        "Enabled"
+      ],
+      "type": "string"
+    },
     "ProvisioningState": {
       "description": "ProvisioningState represents a provisioning state.",
       "enum": [