diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/__init__.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/__init__.py index 14d60e8d2df2..883d9f88931a 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/__init__.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/__init__.py @@ -18,6 +18,12 @@ from .operation_display_py3 import OperationDisplay from .operation_py3 import Operation from .operation_list_result_py3 import OperationListResult + from .subscription_creation_result_py3 import SubscriptionCreationResult + from .ad_principal_py3 import AdPrincipal + from .modern_subscription_creation_parameters_py3 import ModernSubscriptionCreationParameters + from .subscription_operation_py3 import SubscriptionOperation + from .subscription_operation_list_result_py3 import SubscriptionOperationListResult + from .subscription_creation_parameters_py3 import SubscriptionCreationParameters from .location_py3 import Location from .subscription_policies_py3 import SubscriptionPolicies from .subscription_py3 import Subscription @@ -31,6 +37,12 @@ from .operation_display import OperationDisplay from .operation import Operation from .operation_list_result import OperationListResult + from .subscription_creation_result import SubscriptionCreationResult + from .ad_principal import AdPrincipal + from .modern_subscription_creation_parameters import ModernSubscriptionCreationParameters + from .subscription_operation import SubscriptionOperation + from .subscription_operation_list_result import SubscriptionOperationListResult + from .subscription_creation_parameters import SubscriptionCreationParameters from .location import Location from .subscription_policies import SubscriptionPolicies from .subscription import Subscription @@ -39,6 +51,7 @@ from .subscription_paged import SubscriptionPaged from .tenant_id_description_paged import TenantIdDescriptionPaged from .subscription_client_enums import ( + OfferType, SubscriptionState, SpendingLimit, ) @@ -52,6 +65,12 @@ 'OperationDisplay', 'Operation', 'OperationListResult', + 'SubscriptionCreationResult', + 'AdPrincipal', + 'ModernSubscriptionCreationParameters', + 'SubscriptionOperation', + 'SubscriptionOperationListResult', + 'SubscriptionCreationParameters', 'Location', 'SubscriptionPolicies', 'Subscription', @@ -59,6 +78,7 @@ 'LocationPaged', 'SubscriptionPaged', 'TenantIdDescriptionPaged', + 'OfferType', 'SubscriptionState', 'SpendingLimit', ] diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal.py new file mode 100644 index 000000000000..a40e9be229d8 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal.py @@ -0,0 +1,34 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AdPrincipal(Model): + """Active Directory Principal who’ll get owner access on the new subscription. + + All required parameters must be populated in order to send to Azure. + + :param object_id: Required. Object id of the Principal + :type object_id: str + """ + + _validation = { + 'object_id': {'required': True}, + } + + _attribute_map = { + 'object_id': {'key': 'objectId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(AdPrincipal, self).__init__(**kwargs) + self.object_id = kwargs.get('object_id', None) diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal_py3.py new file mode 100644 index 000000000000..d861606f4d0a --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal_py3.py @@ -0,0 +1,34 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AdPrincipal(Model): + """Active Directory Principal who’ll get owner access on the new subscription. + + All required parameters must be populated in order to send to Azure. + + :param object_id: Required. Object id of the Principal + :type object_id: str + """ + + _validation = { + 'object_id': {'required': True}, + } + + _attribute_map = { + 'object_id': {'key': 'objectId', 'type': 'str'}, + } + + def __init__(self, *, object_id: str, **kwargs) -> None: + super(AdPrincipal, self).__init__(**kwargs) + self.object_id = object_id diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id.py index 2eb67562fc5f..e865153bd64c 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id.py @@ -13,12 +13,12 @@ class CanceledSubscriptionId(Model): - """Canceled Subscription Id. + """The ID of the canceled subscription. Variables are only populated by the server, and will be ignored when sending a request. - :ivar value: Canceled Subscription Id + :ivar value: The ID of the canceled subscription :vartype value: str """ diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id_py3.py index 59c22be16568..f6e3d8a79f14 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id_py3.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/canceled_subscription_id_py3.py @@ -13,12 +13,12 @@ class CanceledSubscriptionId(Model): - """Canceled Subscription Id. + """The ID of the canceled subscription. Variables are only populated by the server, and will be ignored when sending a request. - :ivar value: Canceled Subscription Id + :ivar value: The ID of the canceled subscription :vartype value: str """ diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/modern_subscription_creation_parameters.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/modern_subscription_creation_parameters.py new file mode 100644 index 000000000000..3de67bbac19c --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/modern_subscription_creation_parameters.py @@ -0,0 +1,69 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ModernSubscriptionCreationParameters(Model): + """The parameters required to create a new subscription. + + All required parameters must be populated in order to send to Azure. + + :param display_name: Required. The friendly name of the subscription. + :type display_name: str + :param billing_profile_id: Required. The ARM ID of the billing profile for + which you want to create the subscription. + :type billing_profile_id: str + :param sku_id: Required. The SKU ID of the Azure plan. Azure plan + determines the pricing and service-level agreement of the subscription. + Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for + DevTest. + :type sku_id: str + :param cost_center: If set, the cost center will show up on the Azure + usage and charges file. + :type cost_center: str + :param owner: If specified, the AD principal will get owner access to the + subscription, along with the user who is performing the create + subscription operation + :type owner: ~azure.mgmt.subscription.models.AdPrincipal + :param management_group_id: The identifier of the management group to + which this subscription will be associated. + :type management_group_id: str + :param additional_parameters: Additional, untyped parameters to support + custom subscription creation scenarios. + :type additional_parameters: dict[str, object] + """ + + _validation = { + 'display_name': {'required': True}, + 'billing_profile_id': {'required': True}, + 'sku_id': {'required': True}, + } + + _attribute_map = { + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'billing_profile_id': {'key': 'billingProfileId', 'type': 'str'}, + 'sku_id': {'key': 'skuId', 'type': 'str'}, + 'cost_center': {'key': 'costCenter', 'type': 'str'}, + 'owner': {'key': 'owner', 'type': 'AdPrincipal'}, + 'management_group_id': {'key': 'managementGroupId', 'type': 'str'}, + 'additional_parameters': {'key': 'additionalParameters', 'type': '{object}'}, + } + + def __init__(self, **kwargs): + super(ModernSubscriptionCreationParameters, self).__init__(**kwargs) + self.display_name = kwargs.get('display_name', None) + self.billing_profile_id = kwargs.get('billing_profile_id', None) + self.sku_id = kwargs.get('sku_id', None) + self.cost_center = kwargs.get('cost_center', None) + self.owner = kwargs.get('owner', None) + self.management_group_id = kwargs.get('management_group_id', None) + self.additional_parameters = kwargs.get('additional_parameters', None) diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/modern_subscription_creation_parameters_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/modern_subscription_creation_parameters_py3.py new file mode 100644 index 000000000000..e327f07c73cd --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/modern_subscription_creation_parameters_py3.py @@ -0,0 +1,69 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ModernSubscriptionCreationParameters(Model): + """The parameters required to create a new subscription. + + All required parameters must be populated in order to send to Azure. + + :param display_name: Required. The friendly name of the subscription. + :type display_name: str + :param billing_profile_id: Required. The ARM ID of the billing profile for + which you want to create the subscription. + :type billing_profile_id: str + :param sku_id: Required. The SKU ID of the Azure plan. Azure plan + determines the pricing and service-level agreement of the subscription. + Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for + DevTest. + :type sku_id: str + :param cost_center: If set, the cost center will show up on the Azure + usage and charges file. + :type cost_center: str + :param owner: If specified, the AD principal will get owner access to the + subscription, along with the user who is performing the create + subscription operation + :type owner: ~azure.mgmt.subscription.models.AdPrincipal + :param management_group_id: The identifier of the management group to + which this subscription will be associated. + :type management_group_id: str + :param additional_parameters: Additional, untyped parameters to support + custom subscription creation scenarios. + :type additional_parameters: dict[str, object] + """ + + _validation = { + 'display_name': {'required': True}, + 'billing_profile_id': {'required': True}, + 'sku_id': {'required': True}, + } + + _attribute_map = { + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'billing_profile_id': {'key': 'billingProfileId', 'type': 'str'}, + 'sku_id': {'key': 'skuId', 'type': 'str'}, + 'cost_center': {'key': 'costCenter', 'type': 'str'}, + 'owner': {'key': 'owner', 'type': 'AdPrincipal'}, + 'management_group_id': {'key': 'managementGroupId', 'type': 'str'}, + 'additional_parameters': {'key': 'additionalParameters', 'type': '{object}'}, + } + + def __init__(self, *, display_name: str, billing_profile_id: str, sku_id: str, cost_center: str=None, owner=None, management_group_id: str=None, additional_parameters=None, **kwargs) -> None: + super(ModernSubscriptionCreationParameters, self).__init__(**kwargs) + self.display_name = display_name + self.billing_profile_id = billing_profile_id + self.sku_id = sku_id + self.cost_center = cost_center + self.owner = owner + self.management_group_id = management_group_id + self.additional_parameters = additional_parameters diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id.py index fa6813ffc476..fdd8678b9f1b 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id.py @@ -13,12 +13,12 @@ class RenamedSubscriptionId(Model): - """Renamed Subscription Id. + """The ID of the subscriptions that is being renamed. Variables are only populated by the server, and will be ignored when sending a request. - :ivar value: Renamed Subscription Id + :ivar value: The ID of the subscriptions that is being renamed :vartype value: str """ diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id_py3.py index 61ec746346fa..8a21daf8aaa4 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id_py3.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/renamed_subscription_id_py3.py @@ -13,12 +13,12 @@ class RenamedSubscriptionId(Model): - """Renamed Subscription Id. + """The ID of the subscriptions that is being renamed. Variables are only populated by the server, and will be ignored when sending a request. - :ivar value: Renamed Subscription Id + :ivar value: The ID of the subscriptions that is being renamed :vartype value: str """ diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_client_enums.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_client_enums.py index bc846c09187b..95601304f532 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_client_enums.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_client_enums.py @@ -12,6 +12,12 @@ from enum import Enum +class OfferType(str, Enum): + + ms_azr_0017_p = "MS-AZR-0017P" + ms_azr_0148_p = "MS-AZR-0148P" + + class SubscriptionState(str, Enum): enabled = "Enabled" diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters.py new file mode 100644 index 000000000000..da5f3a437e47 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionCreationParameters(Model): + """Subscription Creation Parameters required to create a new Azure + subscription. + + :param display_name: The display name of the subscription. + :type display_name: str + :param owners: The list of principals that should be granted Owner access + on the subscription. Principals should be of type User, Service Principal + or Security Group. + :type owners: list[~azure.mgmt.subscription.models.AdPrincipal] + :param offer_type: The offer type of the subscription. For example, + MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement + devTest) are available. Only valid when creating a subscription in a + enrollment account scope. Possible values include: 'MS-AZR-0017P', + 'MS-AZR-0148P' + :type offer_type: str or ~azure.mgmt.subscription.models.OfferType + :param additional_parameters: Additional, untyped parameters to support + custom subscription creation scenarios. + :type additional_parameters: dict[str, object] + """ + + _attribute_map = { + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'owners': {'key': 'owners', 'type': '[AdPrincipal]'}, + 'offer_type': {'key': 'offerType', 'type': 'str'}, + 'additional_parameters': {'key': 'additionalParameters', 'type': '{object}'}, + } + + def __init__(self, **kwargs): + super(SubscriptionCreationParameters, self).__init__(**kwargs) + self.display_name = kwargs.get('display_name', None) + self.owners = kwargs.get('owners', None) + self.offer_type = kwargs.get('offer_type', None) + self.additional_parameters = kwargs.get('additional_parameters', None) diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters_py3.py new file mode 100644 index 000000000000..3f9693014ab4 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters_py3.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionCreationParameters(Model): + """Subscription Creation Parameters required to create a new Azure + subscription. + + :param display_name: The display name of the subscription. + :type display_name: str + :param owners: The list of principals that should be granted Owner access + on the subscription. Principals should be of type User, Service Principal + or Security Group. + :type owners: list[~azure.mgmt.subscription.models.AdPrincipal] + :param offer_type: The offer type of the subscription. For example, + MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement + devTest) are available. Only valid when creating a subscription in a + enrollment account scope. Possible values include: 'MS-AZR-0017P', + 'MS-AZR-0148P' + :type offer_type: str or ~azure.mgmt.subscription.models.OfferType + :param additional_parameters: Additional, untyped parameters to support + custom subscription creation scenarios. + :type additional_parameters: dict[str, object] + """ + + _attribute_map = { + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'owners': {'key': 'owners', 'type': '[AdPrincipal]'}, + 'offer_type': {'key': 'offerType', 'type': 'str'}, + 'additional_parameters': {'key': 'additionalParameters', 'type': '{object}'}, + } + + def __init__(self, *, display_name: str=None, owners=None, offer_type=None, additional_parameters=None, **kwargs) -> None: + super(SubscriptionCreationParameters, self).__init__(**kwargs) + self.display_name = display_name + self.owners = owners + self.offer_type = offer_type + self.additional_parameters = additional_parameters diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result.py new file mode 100644 index 000000000000..e28373d7f24d --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionCreationResult(Model): + """The created subscription object. + + :param subscription_link: The link to the new subscription. Use this link + to check the status of subscription creation operation. + :type subscription_link: str + """ + + _attribute_map = { + 'subscription_link': {'key': 'subscriptionLink', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(SubscriptionCreationResult, self).__init__(**kwargs) + self.subscription_link = kwargs.get('subscription_link', None) diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result_py3.py new file mode 100644 index 000000000000..672be9752675 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result_py3.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionCreationResult(Model): + """The created subscription object. + + :param subscription_link: The link to the new subscription. Use this link + to check the status of subscription creation operation. + :type subscription_link: str + """ + + _attribute_map = { + 'subscription_link': {'key': 'subscriptionLink', 'type': 'str'}, + } + + def __init__(self, *, subscription_link: str=None, **kwargs) -> None: + super(SubscriptionCreationResult, self).__init__(**kwargs) + self.subscription_link = subscription_link diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name.py index e2a4751b85c4..3ed61662b6fe 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name.py @@ -13,7 +13,7 @@ class SubscriptionName(Model): - """New name of the subscription. + """The new name of the subscription. :param subscription_name: New subscription name :type subscription_name: str diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name_py3.py index de01e7797011..5c90be4cbbe6 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name_py3.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_name_py3.py @@ -13,7 +13,7 @@ class SubscriptionName(Model): - """New name of the subscription. + """The new name of the subscription. :param subscription_name: New subscription name :type subscription_name: str diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation.py new file mode 100644 index 000000000000..fe6c6ca2271d --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation.py @@ -0,0 +1,43 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionOperation(Model): + """status of the subscription POST operation. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar id: The operation Id. + :vartype id: str + :param status: Status of the pending subscription + :type status: str + :param status_detail: Status Detail of the pending subscription + :type status_detail: str + """ + + _validation = { + 'id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'status': {'key': 'status', 'type': 'str'}, + 'status_detail': {'key': 'statusDetail', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(SubscriptionOperation, self).__init__(**kwargs) + self.id = None + self.status = kwargs.get('status', None) + self.status_detail = kwargs.get('status_detail', None) diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_list_result.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_list_result.py new file mode 100644 index 000000000000..0badcdcba5a6 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_list_result.py @@ -0,0 +1,28 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionOperationListResult(Model): + """A list of pending subscription operations. + + :param value: A list of pending SubscriptionOperations + :type value: list[~azure.mgmt.subscription.models.SubscriptionOperation] + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[SubscriptionOperation]'}, + } + + def __init__(self, **kwargs): + super(SubscriptionOperationListResult, self).__init__(**kwargs) + self.value = kwargs.get('value', None) diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_list_result_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_list_result_py3.py new file mode 100644 index 000000000000..19ed87ef03f5 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_list_result_py3.py @@ -0,0 +1,28 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionOperationListResult(Model): + """A list of pending subscription operations. + + :param value: A list of pending SubscriptionOperations + :type value: list[~azure.mgmt.subscription.models.SubscriptionOperation] + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[SubscriptionOperation]'}, + } + + def __init__(self, *, value=None, **kwargs) -> None: + super(SubscriptionOperationListResult, self).__init__(**kwargs) + self.value = value diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_py3.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_py3.py new file mode 100644 index 000000000000..7f06c48b38e2 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_operation_py3.py @@ -0,0 +1,43 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubscriptionOperation(Model): + """status of the subscription POST operation. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar id: The operation Id. + :vartype id: str + :param status: Status of the pending subscription + :type status: str + :param status_detail: Status Detail of the pending subscription + :type status_detail: str + """ + + _validation = { + 'id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'status': {'key': 'status', 'type': 'str'}, + 'status_detail': {'key': 'statusDetail', 'type': 'str'}, + } + + def __init__(self, *, status: str=None, status_detail: str=None, **kwargs) -> None: + super(SubscriptionOperation, self).__init__(**kwargs) + self.id = None + self.status = status + self.status_detail = status_detail diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/__init__.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/__init__.py index f6906611d0e7..e322801174c3 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/__init__.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/__init__.py @@ -9,12 +9,18 @@ # regenerated. # -------------------------------------------------------------------------- -from .operations import Operations from .subscriptions_operations import SubscriptionsOperations +from .subscription_operation_operations import SubscriptionOperationOperations +from .subscription_factory_operations import SubscriptionFactoryOperations +from .subscription_operations import SubscriptionOperations +from .operations import Operations from .tenants_operations import TenantsOperations __all__ = [ - 'Operations', 'SubscriptionsOperations', + 'SubscriptionOperationOperations', + 'SubscriptionFactoryOperations', + 'SubscriptionOperations', + 'Operations', 'TenantsOperations', ] diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/operations.py index 4ec01caf714c..b9efdbcf6876 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/operations.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/operations.py @@ -22,7 +22,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Current version is 2019-03-01-preview. Constant value: "2019-03-01-preview". + :ivar api_version: Version of the API to be used with the client request. Current version is 2015-06-01. Constant value: "2018-03-01-preview". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-03-01-preview" + self.api_version = "2018-03-01-preview" self.config = config diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_factory_operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_factory_operations.py new file mode 100644 index 000000000000..4bc5146dc93c --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_factory_operations.py @@ -0,0 +1,263 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling + +from .. import models + + +class SubscriptionFactoryOperations(object): + """SubscriptionFactoryOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + + self.config = config + + + def _create_subscription_initial( + self, billing_account_name, invoice_section_name, body, custom_headers=None, raw=False, **operation_config): + api_version = "2018-11-01-preview" + + # Construct URL + url = self.create_subscription.metadata['url'] + path_format_arguments = { + 'billingAccountName': self._serialize.url("billing_account_name", billing_account_name, 'str'), + 'invoiceSectionName': self._serialize.url("invoice_section_name", invoice_section_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(body, 'ModernSubscriptionCreationParameters') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202]: + raise models.ErrorResponseException(self._deserialize, response) + + deserialized = None + header_dict = {} + + if response.status_code == 200: + deserialized = self._deserialize('SubscriptionCreationResult', response) + header_dict = { + 'Location': 'str', + 'Retry-After': 'int', + } + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response.add_headers(header_dict) + return client_raw_response + + return deserialized + + def create_subscription( + self, billing_account_name, invoice_section_name, body, custom_headers=None, raw=False, polling=True, **operation_config): + """The operation to create a new Azure subscription. + + :param billing_account_name: The name of the Microsoft Customer + Agreement billing account for which you want to create the + subscription. + :type billing_account_name: str + :param invoice_section_name: The name of the invoice section in the + billing account for which you want to create the subscription. + :type invoice_section_name: str + :param body: The subscription creation parameters. + :type body: + ~azure.mgmt.subscription.models.ModernSubscriptionCreationParameters + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + SubscriptionCreationResult or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.subscription.models.SubscriptionCreationResult] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.subscription.models.SubscriptionCreationResult]] + :raises: + :class:`ErrorResponseException` + """ + raw_result = self._create_subscription_initial( + billing_account_name=billing_account_name, + invoice_section_name=invoice_section_name, + body=body, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + header_dict = { + 'Location': 'str', + 'Retry-After': 'int', + } + deserialized = self._deserialize('SubscriptionCreationResult', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response.add_headers(header_dict) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_subscription.metadata = {'url': '/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoiceSections/{invoiceSectionName}/providers/Microsoft.Subscription/createSubscription'} + + + def _create_subscription_in_enrollment_account_initial( + self, enrollment_account_name, body, custom_headers=None, raw=False, **operation_config): + api_version = "2018-03-01-preview" + + # Construct URL + url = self.create_subscription_in_enrollment_account.metadata['url'] + path_format_arguments = { + 'enrollmentAccountName': self._serialize.url("enrollment_account_name", enrollment_account_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(body, 'SubscriptionCreationParameters') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202]: + raise models.ErrorResponseException(self._deserialize, response) + + deserialized = None + header_dict = {} + + if response.status_code == 200: + deserialized = self._deserialize('SubscriptionCreationResult', response) + header_dict = { + 'Location': 'str', + 'Retry-After': 'str', + } + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response.add_headers(header_dict) + return client_raw_response + + return deserialized + + def create_subscription_in_enrollment_account( + self, enrollment_account_name, body, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates an Azure subscription. + + :param enrollment_account_name: The name of the enrollment account to + which the subscription will be billed. + :type enrollment_account_name: str + :param body: The subscription creation parameters. + :type body: + ~azure.mgmt.subscription.models.SubscriptionCreationParameters + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + SubscriptionCreationResult or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.subscription.models.SubscriptionCreationResult] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.subscription.models.SubscriptionCreationResult]] + :raises: + :class:`ErrorResponseException` + """ + raw_result = self._create_subscription_in_enrollment_account_initial( + enrollment_account_name=enrollment_account_name, + body=body, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + header_dict = { + 'Location': 'str', + 'Retry-After': 'str', + } + deserialized = self._deserialize('SubscriptionCreationResult', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response.add_headers(header_dict) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_subscription_in_enrollment_account.metadata = {'url': '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountName}/providers/Microsoft.Subscription/createSubscription'} diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_operation_operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_operation_operations.py new file mode 100644 index 000000000000..b66fa6f546e9 --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_operation_operations.py @@ -0,0 +1,103 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class SubscriptionOperationOperations(object): + """SubscriptionOperationOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Version of the API to be used with the client request. Current version is 2018-11-01-preview. Constant value: "2018-11-01-preview". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-11-01-preview" + + self.config = config + + def get( + self, operation_id, custom_headers=None, raw=False, **operation_config): + """Get the status of the pending Microsoft.Subscription API operations. + + :param operation_id: The operation ID, which can be found from the + Location field in the generate recommendation response header. + :type operation_id: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: SubscriptionCreationResult or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.subscription.models.SubscriptionCreationResult or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'operationId': self._serialize.url("operation_id", operation_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + header_dict = {} + + if response.status_code == 200: + deserialized = self._deserialize('SubscriptionCreationResult', response) + header_dict = { + 'Location': 'str', + 'Retry-After': 'int', + } + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response.add_headers(header_dict) + return client_raw_response + + return deserialized + get.metadata = {'url': '/providers/Microsoft.Subscription/subscriptionOperations/{operationId}'} diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_operations.py new file mode 100644 index 000000000000..d9feb3bba81a --- /dev/null +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_operations.py @@ -0,0 +1,91 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse + +from .. import models + + +class SubscriptionOperations(object): + """SubscriptionOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Version of the API to be used with the client request. Current version is 2015-06-01. Constant value: "2018-03-01-preview". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-03-01-preview" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """Lists all of the available pending Microsoft.Subscription API + operations. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: SubscriptionOperationListResult or ClientRawResponse if + raw=true + :rtype: + ~azure.mgmt.subscription.models.SubscriptionOperationListResult or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorResponseException` + """ + # Construct URL + url = self.list.metadata['url'] + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SubscriptionOperationListResult', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list.metadata = {'url': '/providers/Microsoft.Subscription/subscriptionOperations'} diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscriptions_operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscriptions_operations.py index 8394544eef8e..ee73c2a96d1c 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscriptions_operations.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/subscriptions_operations.py @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): def cancel( self, subscription_id, custom_headers=None, raw=False, **operation_config): - """Cancels the subscription. + """The operation to cancel a subscription. :param subscription_id: Subscription Id. :type subscription_id: str @@ -96,7 +96,7 @@ def cancel( def rename( self, subscription_id, subscription_name=None, custom_headers=None, raw=False, **operation_config): - """Renames the subscription. + """The operation to rename a subscription. :param subscription_id: Subscription Id. :type subscription_id: str diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/subscription_client.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/subscription_client.py index a5dfa5ea3c15..9c730fea3ef4 100644 --- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/subscription_client.py +++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/subscription_client.py @@ -13,8 +13,11 @@ from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION -from .operations.operations import Operations from .operations.subscriptions_operations import SubscriptionsOperations +from .operations.subscription_operation_operations import SubscriptionOperationOperations +from .operations.subscription_factory_operations import SubscriptionFactoryOperations +from .operations.subscription_operations import SubscriptionOperations +from .operations.operations import Operations from .operations.tenants_operations import TenantsOperations from . import models @@ -52,10 +55,16 @@ class SubscriptionClient(SDKClient): :ivar config: Configuration for client. :vartype config: SubscriptionClientConfiguration - :ivar operations: Operations operations - :vartype operations: azure.mgmt.subscription.operations.Operations :ivar subscriptions: Subscriptions operations :vartype subscriptions: azure.mgmt.subscription.operations.SubscriptionsOperations + :ivar subscription_operation: SubscriptionOperation operations + :vartype subscription_operation: azure.mgmt.subscription.operations.SubscriptionOperationOperations + :ivar subscription_factory: SubscriptionFactory operations + :vartype subscription_factory: azure.mgmt.subscription.operations.SubscriptionFactoryOperations + :ivar subscription_operations: SubscriptionOperations operations + :vartype subscription_operations: azure.mgmt.subscription.operations.SubscriptionOperations + :ivar operations: Operations operations + :vartype operations: azure.mgmt.subscription.operations.Operations :ivar tenants: Tenants operations :vartype tenants: azure.mgmt.subscription.operations.TenantsOperations @@ -75,9 +84,15 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) - self.operations = Operations( - self._client, self.config, self._serialize, self._deserialize) self.subscriptions = SubscriptionsOperations( self._client, self.config, self._serialize, self._deserialize) + self.subscription_operation = SubscriptionOperationOperations( + self._client, self.config, self._serialize, self._deserialize) + self.subscription_factory = SubscriptionFactoryOperations( + self._client, self.config, self._serialize, self._deserialize) + self.subscription_operations = SubscriptionOperations( + self._client, self.config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self.config, self._serialize, self._deserialize) self.tenants = TenantsOperations( self._client, self.config, self._serialize, self._deserialize)