upstreaming changes required by upstream CI

.sha256sum

@@ -1,7 +1,7 @@
-19efc68e41e35c052ea0d194ff390e93ae3cb1d9a91e4d2fb453becb463bf3b8  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
-12d47b965d8a83b06ae3a44c632b624c57b129b5fbcc8c3f8de4fd80e2273f97  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json
-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
-3aede70b183bad612c23cb776fe5a932c5709334e1fe1ad7ff8772b58be3661f  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
-3127f0a6acebf9ce09623df69dbd88824384b58967fe36c19acf2e2cf34c46b2  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-09-04/redhatopenshift.json
+6182ae0b21f71602ac4deb2f04ca4446182795982d160cee9643ab5f3d68db12  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
+8d07850b3e105c16a397c459261dd78feb7bc20f45f26d9cec5137edaf16fa8d  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json
+e4e80ae293dce1a6acfde17fcbd1399487a2fa3587babe6bc69c4ebbdabaa570  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json
+b1f1de0fe40d05de90742b17928968923b936adc294000f58974f50a297581dd  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json
+01ba9562a8dac2824998ff0ad0d2465f79e6a66597bdb321e9409b9f2d12d222  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-04-01/redhatopenshift.json
+724424c5ae3e94e46ecf14efeec6df75442daeafd954cbb9cd515d19f8864fec  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json
+440748951dd1c3b34b5ccbdcb7cd966e3b89490887a1f1d64429561fad789515  swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2023-09-04/redhatopenshift.json

pkg/api/openshiftcluster.go

@@ -169,10 +169,12 @@ type OpenShiftClusterProperties struct {
 type ProvisioningState string
 
 // ProvisioningState constants
+// TODO: ProvisioningStateCancelled is included to pass upstream CI. It is currently unused in ARO.
 const (
 	ProvisioningStateCreating      ProvisioningState = "Creating"
 	ProvisioningStateUpdating      ProvisioningState = "Updating"
 	ProvisioningStateAdminUpdating ProvisioningState = "AdminUpdating"
+	ProvisioningStateCancelled     ProvisioningState = "Cancelled"
 	ProvisioningStateDeleting      ProvisioningState = "Deleting"
 	ProvisioningStateSucceeded     ProvisioningState = "Succeeded"
 	ProvisioningStateFailed        ProvisioningState = "Failed"

pkg/api/v20230701preview/openshiftcluster.go

@@ -75,9 +75,11 @@ type OpenShiftClusterProperties struct {
 type ProvisioningState string
 
 // ProvisioningState constants.
+// TODO: ProvisioningStateCancelled is included to pass upstream CI. It is currently unused in ARO.
 const (
 	ProvisioningStateCreating      ProvisioningState = "Creating"
 	ProvisioningStateUpdating      ProvisioningState = "Updating"
+	ProvisioningStateCancelled     ProvisioningState = "Cancelled"
 	ProvisioningStateAdminUpdating ProvisioningState = "AdminUpdating"
 	ProvisioningStateDeleting      ProvisioningState = "Deleting"
 	ProvisioningStateSucceeded     ProvisioningState = "Succeeded"
@@ -126,6 +128,7 @@ type ServicePrincipalProfile struct {
 	ClientSecret string `json:"clientSecret,omitempty" mutable:"true"`
 }
 
+// The outbound routing strategy used to provide your cluster egress to the internet.
 type OutboundType string
 
 const (
@@ -135,7 +138,7 @@ const (
 
 // ResourceReference represents a reference to an Azure resource.
 type ResourceReference struct {
-	// The fully qualified Azure resource id.
+	// The fully qualified Azure resource id of an IP address resource.
 	ID string `json:"id,omitempty"`
 }
 

pkg/api/v20230701preview/openshiftcluster_validatestatic.go

@@ -82,7 +82,7 @@ func (sv openShiftClusterStaticValidator) validateProperties(path string, p *Ope
 	switch p.ProvisioningState {
 	case ProvisioningStateCreating, ProvisioningStateUpdating,
 		ProvisioningStateAdminUpdating, ProvisioningStateDeleting,
-		ProvisioningStateSucceeded, ProvisioningStateFailed:
+		ProvisioningStateSucceeded, ProvisioningStateFailed, ProvisioningStateCancelled:
 	default:
 		return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".provisioningState", "The provided provisioning state '%s' is invalid.", p.ProvisioningState)
 	}

pkg/swagger/generator.go

@@ -202,7 +202,7 @@ var apis = map[string]*generator{
 		exampleOpenShiftVersionListResponse:            v20230701preview.ExampleOpenShiftVersionListResponse,
 		exampleOperationListResponse:                   api.ExampleOperationListResponse,
 
-		xmsEnum:            []string{"EncryptionAtHost", "FipsValidatedModules", "SoftwareDefinedNetwork", "Visibility"},
+		xmsEnum:            []string{"EncryptionAtHost", "FipsValidatedModules", "SoftwareDefinedNetwork", "Visibility", "OutboundType"},
 		xmsSecretList:      []string{"kubeconfig", "kubeadminPassword", "secretResources"},
 		xmsIdentifiers:     []string{},
 		commonTypesVersion: "v3",

pkg/swagger/typewalker.go

@@ -92,6 +92,7 @@ func (tw *typeWalker) schemaFromType(t types.Type, deps map[*types.Named]struct{
 			s.Type = "boolean"
 		case types.Int:
 			s.Type = "integer"
+			s.Format = "int32"
 		case types.String:
 			s.Type = "string"
 		default:

python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_azure_red_hat_open_shift_client_enums.py

@@ -43,6 +43,8 @@ class FipsValidatedModules(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
     ENABLED = "Enabled"
 
 class OutboundType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
+    """The outbound routing strategy used to provide your cluster egress to the internet.
+    """
 
     LOADBALANCER = "Loadbalancer"
     USER_DEFINED_ROUTING = "UserDefinedRouting"
@@ -52,6 +54,7 @@ class ProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
     """
 
     ADMIN_UPDATING = "AdminUpdating"
+    CANCELLED = "Cancelled"
     CREATING = "Creating"
     DELETING = "Deleting"
     FAILED = "Failed"

python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models.py

@@ -217,7 +217,7 @@ def __init__(
 class EffectiveOutboundIP(msrest.serialization.Model):
     """EffectiveOutboundIP represents an effective outbound IP resource of the cluster public load balancer.
 
-    :ivar id: The fully qualified Azure resource id.
+    :ivar id: The fully qualified Azure of an IP address resource.
     :vartype id: str
     """
 
@@ -230,7 +230,7 @@ def __init__(
         **kwargs
     ):
         """
-        :keyword id: The fully qualified Azure resource id.
+        :keyword id: The fully qualified Azure of an IP address resource.
         :paramtype id: str
         """
         super(EffectiveOutboundIP, self).__init__(**kwargs)
@@ -731,7 +731,7 @@ class OpenShiftCluster(TrackedResource):
     :ivar location: Required. The geo-location where the resource lives.
     :vartype location: str
     :ivar provisioning_state: The cluster provisioning state. Possible values include:
-     "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+     "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
     :vartype provisioning_state: str or
      ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
     :ivar cluster_profile: The cluster profile.
@@ -792,7 +792,7 @@ def __init__(
         :keyword location: Required. The geo-location where the resource lives.
         :paramtype location: str
         :keyword provisioning_state: The cluster provisioning state. Possible values include:
-         "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+         "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
         :paramtype provisioning_state: str or
          ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
         :keyword cluster_profile: The cluster profile.
@@ -922,7 +922,7 @@ class OpenShiftClusterUpdate(msrest.serialization.Model):
     :ivar system_data: The system meta data relating to this resource.
     :vartype system_data: ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.SystemData
     :ivar provisioning_state: The cluster provisioning state. Possible values include:
-     "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+     "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
     :vartype provisioning_state: str or
      ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
     :ivar cluster_profile: The cluster profile.
@@ -973,7 +973,7 @@ def __init__(
         :keyword tags: A set of tags. The resource tags.
         :paramtype tags: dict[str, str]
         :keyword provisioning_state: The cluster provisioning state. Possible values include:
-         "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+         "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
         :paramtype provisioning_state: str or
          ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
         :keyword cluster_profile: The cluster profile.
@@ -1159,7 +1159,7 @@ def __init__(
 class OutboundIP(msrest.serialization.Model):
     """OutboundIP represents a desired outbound IP resource for the cluster load balancer.
 
-    :ivar id: The fully qualified Azure resource id.
+    :ivar id: The fully qualified Azure of an IP address resource.
     :vartype id: str
     """
 
@@ -1172,7 +1172,7 @@ def __init__(
         **kwargs
     ):
         """
-        :keyword id: The fully qualified Azure resource id.
+        :keyword id: The fully qualified Azure of an IP address resource.
         :paramtype id: str
         """
         super(OutboundIP, self).__init__(**kwargs)
@@ -1182,7 +1182,7 @@ def __init__(
 class OutboundIPPrefix(msrest.serialization.Model):
     """OutboundIPPrefix represents a desired outbound IP Prefix resource for the cluster load balancer.
 
-    :ivar id: The fully qualified Azure resource id.
+    :ivar id: The fully qualified Azure of an IP address resource.
     :vartype id: str
     """
 
@@ -1195,7 +1195,7 @@ def __init__(
         **kwargs
     ):
         """
-        :keyword id: The fully qualified Azure resource id.
+        :keyword id: The fully qualified Azure of an IP address resource.
         :paramtype id: str
         """
         super(OutboundIPPrefix, self).__init__(**kwargs)

python/client/azure/mgmt/redhatopenshift/v2023_07_01_preview/models/_models_py3.py

@@ -244,7 +244,7 @@ def __init__(
 class EffectiveOutboundIP(msrest.serialization.Model):
     """EffectiveOutboundIP represents an effective outbound IP resource of the cluster public load balancer.
 
-    :ivar id: The fully qualified Azure resource id.
+    :ivar id: The fully qualified Azure of an IP address resource.
     :vartype id: str
     """
 
@@ -259,7 +259,7 @@ def __init__(
         **kwargs
     ):
         """
-        :keyword id: The fully qualified Azure resource id.
+        :keyword id: The fully qualified Azure of an IP address resource.
         :paramtype id: str
         """
         super(EffectiveOutboundIP, self).__init__(**kwargs)
@@ -791,7 +791,7 @@ class OpenShiftCluster(TrackedResource):
     :ivar location: Required. The geo-location where the resource lives.
     :vartype location: str
     :ivar provisioning_state: The cluster provisioning state. Possible values include:
-     "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+     "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
     :vartype provisioning_state: str or
      ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
     :ivar cluster_profile: The cluster profile.
@@ -864,7 +864,7 @@ def __init__(
         :keyword location: Required. The geo-location where the resource lives.
         :paramtype location: str
         :keyword provisioning_state: The cluster provisioning state. Possible values include:
-         "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+         "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
         :paramtype provisioning_state: str or
          ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
         :keyword cluster_profile: The cluster profile.
@@ -1002,7 +1002,7 @@ class OpenShiftClusterUpdate(msrest.serialization.Model):
     :ivar system_data: The system meta data relating to this resource.
     :vartype system_data: ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.SystemData
     :ivar provisioning_state: The cluster provisioning state. Possible values include:
-     "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+     "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
     :vartype provisioning_state: str or
      ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
     :ivar cluster_profile: The cluster profile.
@@ -1064,7 +1064,7 @@ def __init__(
         :keyword tags: A set of tags. The resource tags.
         :paramtype tags: dict[str, str]
         :keyword provisioning_state: The cluster provisioning state. Possible values include:
-         "AdminUpdating", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
+         "AdminUpdating", "Cancelled", "Creating", "Deleting", "Failed", "Succeeded", "Updating".
         :paramtype provisioning_state: str or
          ~azure.mgmt.redhatopenshift.v2023_07_01_preview.models.ProvisioningState
         :keyword cluster_profile: The cluster profile.
@@ -1262,7 +1262,7 @@ def __init__(
 class OutboundIP(msrest.serialization.Model):
     """OutboundIP represents a desired outbound IP resource for the cluster load balancer.
 
-    :ivar id: The fully qualified Azure resource id.
+    :ivar id: The fully qualified Azure of an IP address resource.
     :vartype id: str
     """
 
@@ -1277,7 +1277,7 @@ def __init__(
         **kwargs
     ):
         """
-        :keyword id: The fully qualified Azure resource id.
+        :keyword id: The fully qualified Azure of an IP address resource.
         :paramtype id: str
         """
         super(OutboundIP, self).__init__(**kwargs)
@@ -1287,7 +1287,7 @@ def __init__(
 class OutboundIPPrefix(msrest.serialization.Model):
     """OutboundIPPrefix represents a desired outbound IP Prefix resource for the cluster load balancer.
 
-    :ivar id: The fully qualified Azure resource id.
+    :ivar id: The fully qualified Azure of an IP address resource.
     :vartype id: str
     """
 
@@ -1302,7 +1302,7 @@ def __init__(
         **kwargs
     ):
         """
-        :keyword id: The fully qualified Azure resource id.
+        :keyword id: The fully qualified Azure of an IP address resource.
         :paramtype id: str
         """
         super(OutboundIPPrefix, self).__init__(**kwargs)

swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json

@@ -894,6 +894,7 @@
           "description": "The size of the worker VMs."
         },
         "diskSizeGB": {
+          "format": "int32",
           "description": "The disk size of the worker VMs.",
           "type": "integer"
         },
@@ -902,6 +903,7 @@
           "type": "string"
         },
         "count": {
+          "format": "int32",
           "description": "The number of worker VMs.",
           "type": "integer"
         },