From 172a3050710dc3f8b15aeb3c5fc0c7a6638ddc4f Mon Sep 17 00:00:00 2001 From: Caden Marchese Date: Thu, 16 Sep 2021 14:30:42 -0400 Subject: [PATCH 1/2] add L-series SKUs to internal, admin, validate api --- .sha256sum | 2 +- pkg/api/admin/openshiftcluster.go | 10 +++++++ pkg/api/openshiftcluster.go | 10 +++++++ pkg/api/validate/dynamic/quota.go | 27 +++++++++++++++++++ pkg/api/validate/vm.go | 11 +++++++- .../redhatopenshift/enums.go | 10 ++++++- .../redhatopenshift/models.go | 4 +-- .../_azure_red_hat_open_shift_client_enums.py | 4 +++ .../v2021_09_01_preview/models/_models.py | 4 +-- .../v2021_09_01_preview/models/_models_py3.py | 4 +-- 10 files changed, 77 insertions(+), 9 deletions(-) diff --git a/.sha256sum b/.sha256sum index a5059ecf2f2..c1599882083 100644 --- a/.sha256sum +++ b/.sha256sum @@ -1,2 +1,2 @@ 468fa0da0a50d50640ec57843ad288af343128b39f5bf23e76e4e336580883d4 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json -c323c84befa5ea11da50a2407050abed6540ea01e796720bc2241604ce80567c swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json +d9d81493a710b87ff4e61a7b1465b3a49c31b78371faeb30bdad946d6a0bf61a swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json diff --git a/pkg/api/admin/openshiftcluster.go b/pkg/api/admin/openshiftcluster.go index ab5b60a8351..0d2f69cd881 100644 --- a/pkg/api/admin/openshiftcluster.go +++ b/pkg/api/admin/openshiftcluster.go @@ -170,6 +170,16 @@ const ( VMSizeStandardM128ms VMSize = "Standard_M128ms" VMSizeStandardG5 VMSize = "Standard_G5" VMSizeStandardGS5 VMSize = "Standard_GS5" + + VMSizeStandardL4s VMSize = "Standard_L4s" + VMSizeStandardL8s VMSize = "Standard_L8s" + VMSizeStandardL16s VMSize = "Standard_L16s" + VMSizeStandardL32s VMSize = "Standard_L32s" + VMSizeStandardL8sV2 VMSize = "Standard_L8s_v2" + VMSizeStandardL16sV2 VMSize = "Standard_L16s_v2" + VMSizeStandardL32sV2 VMSize = "Standard_L32s_v2" + VMSizeStandardL48sV2 VMSize = "Standard_L48s_v2" + VMSizeStandardL64sV2 VMSize = "Standard_L64s_v2" ) // WorkerProfile represents a worker profile. diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go index c2a1f7802d0..878974d5a0e 100644 --- a/pkg/api/openshiftcluster.go +++ b/pkg/api/openshiftcluster.go @@ -286,6 +286,16 @@ const ( VMSizeStandardM128ms VMSize = "Standard_M128ms" VMSizeStandardG5 VMSize = "Standard_G5" VMSizeStandardGS5 VMSize = "Standard_GS5" + + VMSizeStandardL4s VMSize = "Standard_L4s" + VMSizeStandardL8s VMSize = "Standard_L8s" + VMSizeStandardL16s VMSize = "Standard_L16s" + VMSizeStandardL32s VMSize = "Standard_L32s" + VMSizeStandardL8sV2 VMSize = "Standard_L8s_v2" + VMSizeStandardL16sV2 VMSize = "Standard_L16s_v2" + VMSizeStandardL32sV2 VMSize = "Standard_L32s_v2" + VMSizeStandardL48sV2 VMSize = "Standard_L48s_v2" + VMSizeStandardL64sV2 VMSize = "Standard_L64s_v2" ) // WorkerProfile represents a worker profile diff --git a/pkg/api/validate/dynamic/quota.go b/pkg/api/validate/dynamic/quota.go index 4c1181b427e..c6305ab05d3 100644 --- a/pkg/api/validate/dynamic/quota.go +++ b/pkg/api/validate/dynamic/quota.go @@ -88,6 +88,33 @@ func addRequiredResources(requiredResources map[string]int, vmSize api.VMSize, c case api.VMSizeStandardGS5: requiredResources["standardGSFamily"] += (count * 32) requiredResources["cores"] += (count * 32) + case api.VMSizeStandardL4s: + requiredResources["standardLsFamily"] += (count * 4) + requiredResources["cores"] += (count * 4) + case api.VMSizeStandardL8s: + requiredResources["standardLsFamily"] += (count * 8) + requiredResources["cores"] += (count * 8) + case api.VMSizeStandardL16s: + requiredResources["standardLsFamily"] += (count * 16) + requiredResources["cores"] += (count * 16) + case api.VMSizeStandardL32s: + requiredResources["standardLsFamily"] += (count * 32) + requiredResources["cores"] += (count * 32) + case api.VMSizeStandardL8sV2: + requiredResources["standardLsv2Family"] += (count * 8) + requiredResources["cores"] += (count * 8) + case api.VMSizeStandardL16sV2: + requiredResources["standardLsv2Family"] += (count * 16) + requiredResources["cores"] += (count * 16) + case api.VMSizeStandardL32sV2: + requiredResources["standardLsv2Family"] += (count * 32) + requiredResources["cores"] += (count * 32) + case api.VMSizeStandardL48sV2: + requiredResources["standardLsv2Family"] += (count * 48) + requiredResources["cores"] += (count * 48) + case api.VMSizeStandardL64sV2: + requiredResources["standardLsv2Family"] += (count * 64) + requiredResources["cores"] += (count * 64) default: //will only happen if pkg/api verification allows new VMSizes return fmt.Errorf("unexpected node VMSize %s", vmSize) diff --git a/pkg/api/validate/vm.go b/pkg/api/validate/vm.go index e8d8c53b56d..79f8b19b552 100644 --- a/pkg/api/validate/vm.go +++ b/pkg/api/validate/vm.go @@ -54,7 +54,16 @@ func VMSizeIsValid(vmSize api.VMSize, requiredD2sV3Workers, isMaster bool) bool api.VMSizeStandardF72sV2, api.VMSizeStandardG5, api.VMSizeStandardGS5, - api.VMSizeStandardM128ms: + api.VMSizeStandardM128ms, + api.VMSizeStandardL4s, + api.VMSizeStandardL8s, + api.VMSizeStandardL16s, + api.VMSizeStandardL32s, + api.VMSizeStandardL8sV2, + api.VMSizeStandardL16sV2, + api.VMSizeStandardL32sV2, + api.VMSizeStandardL48sV2, + api.VMSizeStandardL64sV2: return true } } diff --git a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go index 0b110337485..6e72d4dc1bc 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go +++ b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go @@ -152,11 +152,19 @@ const ( StandardG5 VMSize = "Standard_G5" // StandardGS5 ... StandardGS5 VMSize = "Standard_GS5" + // StandardL16s ... + StandardL16s VMSize = "Standard_L16s" + // StandardL32s ... + StandardL32s VMSize = "Standard_L32s" + // StandardL4s ... + StandardL4s VMSize = "Standard_L4s" + // StandardL8s ... + StandardL8s VMSize = "Standard_L8s" // StandardM128ms ... StandardM128ms VMSize = "Standard_M128ms" ) // PossibleVMSizeValues returns an array of possible values for the VMSize const type. func PossibleVMSizeValues() []VMSize { - return []VMSize{StandardD16asV4, StandardD16sV3, StandardD2sV3, StandardD32asV4, StandardD32sV3, StandardD4asV4, StandardD4sV3, StandardD8asV4, StandardD8sV3, StandardE16sV3, StandardE32sV3, StandardE4sV3, StandardE64isV3, StandardE64iV3, StandardE8sV3, StandardF16sV2, StandardF32sV2, StandardF4sV2, StandardF72sV2, StandardF8sV2, StandardG5, StandardGS5, StandardM128ms} + return []VMSize{StandardD16asV4, StandardD16sV3, StandardD2sV3, StandardD32asV4, StandardD32sV3, StandardD4asV4, StandardD4sV3, StandardD8asV4, StandardD8sV3, StandardE16sV3, StandardE32sV3, StandardE4sV3, StandardE64isV3, StandardE64iV3, StandardE8sV3, StandardF16sV2, StandardF32sV2, StandardF4sV2, StandardF72sV2, StandardF8sV2, StandardG5, StandardGS5, StandardL16s, StandardL32s, StandardL4s, StandardL8s, StandardM128ms} } diff --git a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go index 299fef2d6f4..f2727633036 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go +++ b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go @@ -120,7 +120,7 @@ type IngressProfile struct { // MasterProfile masterProfile represents a master profile. type MasterProfile struct { - // VMSize - The size of the master VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardM128ms' + // VMSize - The size of the master VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM128ms' VMSize VMSize `json:"vmSize,omitempty"` // SubnetID - The Azure resource ID of the master subnet. SubnetID *string `json:"subnetId,omitempty"` @@ -893,7 +893,7 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { type WorkerProfile struct { // Name - The worker profile name. Name *string `json:"name,omitempty"` - // VMSize - The size of the worker VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardM128ms' + // VMSize - The size of the worker VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM128ms' VMSize VMSize `json:"vmSize,omitempty"` // DiskSizeGB - The disk size of the worker VMs. DiskSizeGB *int32 `json:"diskSizeGB,omitempty"` diff --git a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py index 462e4b71dbb..d33979a4b30 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py +++ b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py @@ -101,4 +101,8 @@ class VMSize(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): STANDARD_F8_S_V2 = "Standard_F8s_v2" STANDARD_G5 = "Standard_G5" STANDARD_GS5 = "Standard_GS5" + STANDARD_L16_S = "Standard_L16s" + STANDARD_L32_S = "Standard_L32s" + STANDARD_L4_S = "Standard_L4s" + STANDARD_L8_S = "Standard_L8s" STANDARD_M128_MS = "Standard_M128ms" diff --git a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py index 2e7e61ecb15..a42ba7c8da0 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py +++ b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# # Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- @@ -691,7 +691,7 @@ class WorkerProfile(msrest.serialization.Model): "Standard_E16s_v3", "Standard_E32s_v3", "Standard_E4s_v3", "Standard_E64i_v3", "Standard_E64is_v3", "Standard_E8s_v3", "Standard_F16s_v2", "Standard_F32s_v2", "Standard_F4s_v2", "Standard_F72s_v2", "Standard_F8s_v2", "Standard_G5", "Standard_GS5", - "Standard_M128ms". + "Standard_L16s", "Standard_L32s", "Standard_L4s", "Standard_L8s", "Standard_M128ms". :type vm_size: str or ~azure.mgmt.redhatopenshift.v2021_09_01_preview.models.VMSize :param disk_size_gb: The disk size of the worker VMs. :type disk_size_gb: int diff --git a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py index ff2a8610b4a..4e7502710ac 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py +++ b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# # Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- @@ -781,7 +781,7 @@ class WorkerProfile(msrest.serialization.Model): "Standard_E16s_v3", "Standard_E32s_v3", "Standard_E4s_v3", "Standard_E64i_v3", "Standard_E64is_v3", "Standard_E8s_v3", "Standard_F16s_v2", "Standard_F32s_v2", "Standard_F4s_v2", "Standard_F72s_v2", "Standard_F8s_v2", "Standard_G5", "Standard_GS5", - "Standard_M128ms". + "Standard_L16s", "Standard_L32s", "Standard_L4s", "Standard_L8s", "Standard_M128ms". :type vm_size: str or ~azure.mgmt.redhatopenshift.v2021_09_01_preview.models.VMSize :param disk_size_gb: The disk size of the worker VMs. :type disk_size_gb: int From ddb201c254a24c83fdcb863d4d04f2c204689d8a Mon Sep 17 00:00:00 2001 From: Caden Marchese Date: Fri, 15 Oct 2021 11:45:12 -0400 Subject: [PATCH 2/2] make client --- .sha256sum | 2 +- .../mgmt/2021-09-01-preview/redhatopenshift/enums.go | 10 +--------- .../mgmt/2021-09-01-preview/redhatopenshift/models.go | 4 ++-- .../models/_azure_red_hat_open_shift_client_enums.py | 4 ---- .../v2021_09_01_preview/models/_models.py | 4 ++-- .../v2021_09_01_preview/models/_models_py3.py | 4 ++-- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.sha256sum b/.sha256sum index c1599882083..a5059ecf2f2 100644 --- a/.sha256sum +++ b/.sha256sum @@ -1,2 +1,2 @@ 468fa0da0a50d50640ec57843ad288af343128b39f5bf23e76e4e336580883d4 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json -d9d81493a710b87ff4e61a7b1465b3a49c31b78371faeb30bdad946d6a0bf61a swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json +c323c84befa5ea11da50a2407050abed6540ea01e796720bc2241604ce80567c swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json diff --git a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go index 6e72d4dc1bc..0b110337485 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go +++ b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/enums.go @@ -152,19 +152,11 @@ const ( StandardG5 VMSize = "Standard_G5" // StandardGS5 ... StandardGS5 VMSize = "Standard_GS5" - // StandardL16s ... - StandardL16s VMSize = "Standard_L16s" - // StandardL32s ... - StandardL32s VMSize = "Standard_L32s" - // StandardL4s ... - StandardL4s VMSize = "Standard_L4s" - // StandardL8s ... - StandardL8s VMSize = "Standard_L8s" // StandardM128ms ... StandardM128ms VMSize = "Standard_M128ms" ) // PossibleVMSizeValues returns an array of possible values for the VMSize const type. func PossibleVMSizeValues() []VMSize { - return []VMSize{StandardD16asV4, StandardD16sV3, StandardD2sV3, StandardD32asV4, StandardD32sV3, StandardD4asV4, StandardD4sV3, StandardD8asV4, StandardD8sV3, StandardE16sV3, StandardE32sV3, StandardE4sV3, StandardE64isV3, StandardE64iV3, StandardE8sV3, StandardF16sV2, StandardF32sV2, StandardF4sV2, StandardF72sV2, StandardF8sV2, StandardG5, StandardGS5, StandardL16s, StandardL32s, StandardL4s, StandardL8s, StandardM128ms} + return []VMSize{StandardD16asV4, StandardD16sV3, StandardD2sV3, StandardD32asV4, StandardD32sV3, StandardD4asV4, StandardD4sV3, StandardD8asV4, StandardD8sV3, StandardE16sV3, StandardE32sV3, StandardE4sV3, StandardE64isV3, StandardE64iV3, StandardE8sV3, StandardF16sV2, StandardF32sV2, StandardF4sV2, StandardF72sV2, StandardF8sV2, StandardG5, StandardGS5, StandardM128ms} } diff --git a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go index f2727633036..299fef2d6f4 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go +++ b/pkg/client/services/redhatopenshift/mgmt/2021-09-01-preview/redhatopenshift/models.go @@ -120,7 +120,7 @@ type IngressProfile struct { // MasterProfile masterProfile represents a master profile. type MasterProfile struct { - // VMSize - The size of the master VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM128ms' + // VMSize - The size of the master VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardM128ms' VMSize VMSize `json:"vmSize,omitempty"` // SubnetID - The Azure resource ID of the master subnet. SubnetID *string `json:"subnetId,omitempty"` @@ -893,7 +893,7 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) { type WorkerProfile struct { // Name - The worker profile name. Name *string `json:"name,omitempty"` - // VMSize - The size of the worker VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardL16s', 'StandardL32s', 'StandardL4s', 'StandardL8s', 'StandardM128ms' + // VMSize - The size of the worker VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardM128ms' VMSize VMSize `json:"vmSize,omitempty"` // DiskSizeGB - The disk size of the worker VMs. DiskSizeGB *int32 `json:"diskSizeGB,omitempty"` diff --git a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py index d33979a4b30..462e4b71dbb 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py +++ b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_azure_red_hat_open_shift_client_enums.py @@ -101,8 +101,4 @@ class VMSize(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): STANDARD_F8_S_V2 = "Standard_F8s_v2" STANDARD_G5 = "Standard_G5" STANDARD_GS5 = "Standard_GS5" - STANDARD_L16_S = "Standard_L16s" - STANDARD_L32_S = "Standard_L32s" - STANDARD_L4_S = "Standard_L4s" - STANDARD_L8_S = "Standard_L8s" STANDARD_M128_MS = "Standard_M128ms" diff --git a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py index a42ba7c8da0..2e7e61ecb15 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py +++ b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models.py @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# # Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- @@ -691,7 +691,7 @@ class WorkerProfile(msrest.serialization.Model): "Standard_E16s_v3", "Standard_E32s_v3", "Standard_E4s_v3", "Standard_E64i_v3", "Standard_E64is_v3", "Standard_E8s_v3", "Standard_F16s_v2", "Standard_F32s_v2", "Standard_F4s_v2", "Standard_F72s_v2", "Standard_F8s_v2", "Standard_G5", "Standard_GS5", - "Standard_L16s", "Standard_L32s", "Standard_L4s", "Standard_L8s", "Standard_M128ms". + "Standard_M128ms". :type vm_size: str or ~azure.mgmt.redhatopenshift.v2021_09_01_preview.models.VMSize :param disk_size_gb: The disk size of the worker VMs. :type disk_size_gb: int diff --git a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py index 4e7502710ac..ff2a8610b4a 100644 --- a/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py +++ b/python/client/azure/mgmt/redhatopenshift/v2021_09_01_preview/models/_models_py3.py @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# # Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- @@ -781,7 +781,7 @@ class WorkerProfile(msrest.serialization.Model): "Standard_E16s_v3", "Standard_E32s_v3", "Standard_E4s_v3", "Standard_E64i_v3", "Standard_E64is_v3", "Standard_E8s_v3", "Standard_F16s_v2", "Standard_F32s_v2", "Standard_F4s_v2", "Standard_F72s_v2", "Standard_F8s_v2", "Standard_G5", "Standard_GS5", - "Standard_L16s", "Standard_L32s", "Standard_L4s", "Standard_L8s", "Standard_M128ms". + "Standard_M128ms". :type vm_size: str or ~azure.mgmt.redhatopenshift.v2021_09_01_preview.models.VMSize :param disk_size_gb: The disk size of the worker VMs. :type disk_size_gb: int