From 8559f040a5004c0f14a241567249aaf0456ce22d Mon Sep 17 00:00:00 2001 From: cxznmhdcxz <> Date: Mon, 9 May 2022 11:07:24 +0800 Subject: [PATCH 1/4] support offer type --- src/subscription/azext_subscription/_params.py | 3 ++- .../subscription/models/subscription_client_enums.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/subscription/azext_subscription/_params.py b/src/subscription/azext_subscription/_params.py index 4b011ac3f71..d3da360fef6 100644 --- a/src/subscription/azext_subscription/_params.py +++ b/src/subscription/azext_subscription/_params.py @@ -4,13 +4,14 @@ # -------------------------------------------------------------------------------------------- from azure.cli.core.commands.parameters import get_enum_type +from .subscription.models import OfferType # pylint: disable=line-too-long def load_arguments(self, _): with self.argument_context('account create') as c: c.argument('enrollment_account_name', options_list=('--enrollment-account-name', '--enrollment-account-object-id'), required=True, help='The name of the enrollment account which should be used to create a subscription.') - c.argument('offer_type', required=True, help='The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.', arg_type=get_enum_type(['MS-AZR-0017P', 'MS-AZR-0148P'])) + c.argument('offer_type', required=True, help='The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.', arg_type=get_enum_type(OfferType)) c.argument('display_name', help='The display name of the subscription.') c.argument('owner_object_id', help='The object id(s) of the owner(s) which should be granted access to the new subscription.') c.argument('owner_spn', help='The service principal name(s) of the owner(s) which should be granted access to the new subscription.') diff --git a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py index 95601304f53..f585df5262f 100644 --- a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py +++ b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py @@ -16,6 +16,8 @@ class OfferType(str, Enum): ms_azr_0017_p = "MS-AZR-0017P" ms_azr_0148_p = "MS-AZR-0148P" + MS_AZR_USGOV_0017P = "MS-AZR-USGOV-0017P" + MS_AZR_USGOV_0003P = "MS-AZR-USGOV-0003P" class SubscriptionState(str, Enum): From 2bd84da1f8d2cb15a34541be003e4d7038ab883e Mon Sep 17 00:00:00 2001 From: cxznmhdcxz <> Date: Mon, 9 May 2022 12:10:27 +0800 Subject: [PATCH 2/4] unify lower case --- .../subscription/models/subscription_client_enums.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py index f585df5262f..93113346044 100644 --- a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py +++ b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py @@ -16,8 +16,8 @@ class OfferType(str, Enum): ms_azr_0017_p = "MS-AZR-0017P" ms_azr_0148_p = "MS-AZR-0148P" - MS_AZR_USGOV_0017P = "MS-AZR-USGOV-0017P" - MS_AZR_USGOV_0003P = "MS-AZR-USGOV-0003P" + ms_azr_usgov_0017p = "MS-AZR-USGOV-0017P" + ms_azr_usgov_0003p = "MS-AZR-USGOV-0003P" class SubscriptionState(str, Enum): From 1d36865312aec91361123161776a13af05d55a56 Mon Sep 17 00:00:00 2001 From: cxznmhdcxz <> Date: Thu, 12 May 2022 11:21:23 +0800 Subject: [PATCH 3/4] add supported offertype --- .../subscription/models/subscription_client_enums.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py index 93113346044..bc9a6100d16 100644 --- a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py +++ b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py @@ -18,6 +18,8 @@ class OfferType(str, Enum): ms_azr_0148_p = "MS-AZR-0148P" ms_azr_usgov_0017p = "MS-AZR-USGOV-0017P" ms_azr_usgov_0003p = "MS-AZR-USGOV-0003P" + ms_azr_usgov_0015p = "MS-AZR-USGOV-0015P" + ms_azr_usgov_0148p = "MS-AZR-USGOV-0148P" class SubscriptionState(str, Enum): From 994eeb33b4660b8fcb56f9aeb99d6c6693e09b27 Mon Sep 17 00:00:00 2001 From: cxznmhdcxz <> Date: Fri, 13 May 2022 11:55:05 +0800 Subject: [PATCH 4/4] update supported OfferType --- .../subscription/models/subscription_client_enums.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py index bc9a6100d16..bee6b315249 100644 --- a/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py +++ b/src/subscription/azext_subscription/subscription/models/subscription_client_enums.py @@ -17,7 +17,6 @@ class OfferType(str, Enum): ms_azr_0017_p = "MS-AZR-0017P" ms_azr_0148_p = "MS-AZR-0148P" ms_azr_usgov_0017p = "MS-AZR-USGOV-0017P" - ms_azr_usgov_0003p = "MS-AZR-USGOV-0003P" ms_azr_usgov_0015p = "MS-AZR-USGOV-0015P" ms_azr_usgov_0148p = "MS-AZR-USGOV-0148P"