From 049ea95711b7e8ac56cab62846ac6b69e3a9c1fe Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 7 Jun 2019 10:47:12 -0700 Subject: [PATCH] [AutoPR managedservices/resource-manager] [Hub Generated] Review request for Microsoft.ManagedServices to add version preview/2019-04-01-preview (#5609) * Generated from 2aa8d70a5f867f439b78630358b37612482b3ace Resolved review comments by Sanjai 1. Updated version 2. Removed Operationstatus * Generated from 88d2323d3bfdeb3ed538c0c6effaca39a7daaaae Changed Modelasstring to true as per the suggestion --- .../managed_services_client.py | 2 +- .../registration_assignment_properties.py | 2 +- .../registration_assignment_properties_py3.py | 2 +- ...ties_registration_definition_properties.py | 2 +- ..._registration_definition_properties_py3.py | 2 +- .../registration_definition_properties.py | 2 +- .../registration_definition_properties_py3.py | 2 +- .../registration_assignments_operations.py | 143 ++++++++++++------ .../registration_definitions_operations.py | 103 ++++++++----- 9 files changed, 170 insertions(+), 90 deletions(-) diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/managed_services_client.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/managed_services_client.py index f203c43a60f..d1497f66880 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/managed_services_client.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/managed_services_client.py @@ -72,7 +72,7 @@ def __init__( super(ManagedServicesClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2018-06-01-preview' + self.api_version = '2019-04-01-preview' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties.py index 8e4bab71b31..2b0f757e3d6 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties.py @@ -43,7 +43,7 @@ class RegistrationAssignmentProperties(Model): _attribute_map = { 'registration_definition_id': {'key': 'registrationDefinitionId', 'type': 'str'}, - 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'registration_definition': {'key': 'registrationDefinition', 'type': 'RegistrationAssignmentPropertiesRegistrationDefinition'}, } diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_py3.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_py3.py index 1eb37689784..0cc52d0144e 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_py3.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_py3.py @@ -43,7 +43,7 @@ class RegistrationAssignmentProperties(Model): _attribute_map = { 'registration_definition_id': {'key': 'registrationDefinitionId', 'type': 'str'}, - 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'registration_definition': {'key': 'registrationDefinition', 'type': 'RegistrationAssignmentPropertiesRegistrationDefinition'}, } diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties.py index c6c54637627..073e2827f11 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties.py @@ -43,7 +43,7 @@ class RegistrationAssignmentPropertiesRegistrationDefinitionProperties(Model): 'description': {'key': 'description', 'type': 'str'}, 'authorizations': {'key': 'authorizations', 'type': '[Authorization]'}, 'registration_definition_name': {'key': 'registrationDefinitionName', 'type': 'str'}, - 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'managee_tenant_id': {'key': 'manageeTenantId', 'type': 'str'}, 'managee_tenant_name': {'key': 'manageeTenantName', 'type': 'str'}, 'managed_by_tenant_id': {'key': 'managedByTenantId', 'type': 'str'}, diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties_py3.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties_py3.py index c74e5cc908e..5dd43174cf1 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties_py3.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_assignment_properties_registration_definition_properties_py3.py @@ -43,7 +43,7 @@ class RegistrationAssignmentPropertiesRegistrationDefinitionProperties(Model): 'description': {'key': 'description', 'type': 'str'}, 'authorizations': {'key': 'authorizations', 'type': '[Authorization]'}, 'registration_definition_name': {'key': 'registrationDefinitionName', 'type': 'str'}, - 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'managee_tenant_id': {'key': 'manageeTenantId', 'type': 'str'}, 'managee_tenant_name': {'key': 'manageeTenantName', 'type': 'str'}, 'managed_by_tenant_id': {'key': 'managedByTenantId', 'type': 'str'}, diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties.py index 7581c792191..714a1a94685 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties.py @@ -53,7 +53,7 @@ class RegistrationDefinitionProperties(Model): 'authorizations': {'key': 'authorizations', 'type': '[Authorization]'}, 'registration_definition_name': {'key': 'registrationDefinitionName', 'type': 'str'}, 'managed_by_tenant_id': {'key': 'managedByTenantId', 'type': 'str'}, - 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'managed_by_tenant_name': {'key': 'managedByTenantName', 'type': 'str'}, } diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties_py3.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties_py3.py index c2f207bd5c2..f22a794c8e7 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties_py3.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/registration_definition_properties_py3.py @@ -53,7 +53,7 @@ class RegistrationDefinitionProperties(Model): 'authorizations': {'key': 'authorizations', 'type': '[Authorization]'}, 'registration_definition_name': {'key': 'registrationDefinitionName', 'type': 'str'}, 'managed_by_tenant_id': {'key': 'managedByTenantId', 'type': 'str'}, - 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, 'managed_by_tenant_name': {'key': 'managedByTenantName', 'type': 'str'}, } diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_assignments_operations.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_assignments_operations.py index 325b9bec7e9..e1295fca4bc 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_assignments_operations.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_assignments_operations.py @@ -11,6 +11,8 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -103,28 +105,9 @@ def get( return deserialized get.metadata = {'url': '/{scope}/providers/Microsoft.ManagedServices/registrationAssignments/{registrationAssignmentId}'} - def delete( - self, scope, registration_assignment_id, api_version, custom_headers=None, raw=False, **operation_config): - """Deletes the specified registration assignment. - :param scope: Scope of the resource. - :type scope: str - :param registration_assignment_id: Guid of the registration - assignment. - :type registration_assignment_id: str - :param api_version: The API version to use for this operation. - :type api_version: 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: RegistrationAssignment or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.managedservices.models.RegistrationAssignment or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ + def _delete_initial( + self, scope, registration_assignment_id, api_version, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.delete.metadata['url'] path_format_arguments = { @@ -139,7 +122,6 @@ def delete( # 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: @@ -151,24 +133,16 @@ def delete( request = self._client.delete(url, query_parameters, header_parameters) response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [200, 204]: + if response.status_code not in [200, 202, 204]: raise models.ErrorResponseException(self._deserialize, response) - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('RegistrationAssignment', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - return deserialized - delete.metadata = {'url': '/{scope}/providers/Microsoft.ManagedServices/registrationAssignments/{registrationAssignmentId}'} - - def create_or_update( - self, scope, registration_assignment_id, api_version, properties=None, custom_headers=None, raw=False, **operation_config): - """Creates or updates a registration assignment. + def delete( + self, scope, registration_assignment_id, api_version, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes the specified registration assignment. :param scope: Scope of the resource. :type scope: str @@ -177,20 +151,44 @@ def create_or_update( :type registration_assignment_id: str :param api_version: The API version to use for this operation. :type api_version: str - :param properties: Properties of a registration assignment. - :type properties: - ~azure.mgmt.managedservices.models.RegistrationAssignmentProperties :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: RegistrationAssignment or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.managedservices.models.RegistrationAssignment or - ~msrest.pipeline.ClientRawResponse + :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 None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`ErrorResponseException` """ + raw_result = self._delete_initial( + scope=scope, + registration_assignment_id=registration_assignment_id, + api_version=api_version, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + 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) + delete.metadata = {'url': '/{scope}/providers/Microsoft.ManagedServices/registrationAssignments/{registrationAssignmentId}'} + + + def _create_or_update_initial( + self, scope, registration_assignment_id, api_version, properties=None, custom_headers=None, raw=False, **operation_config): request_body = models.RegistrationAssignment(properties=properties) # Construct URL @@ -238,6 +236,61 @@ def create_or_update( return client_raw_response return deserialized + + def create_or_update( + self, scope, registration_assignment_id, api_version, properties=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates or updates a registration assignment. + + :param scope: Scope of the resource. + :type scope: str + :param registration_assignment_id: Guid of the registration + assignment. + :type registration_assignment_id: str + :param api_version: The API version to use for this operation. + :type api_version: str + :param properties: Properties of a registration assignment. + :type properties: + ~azure.mgmt.managedservices.models.RegistrationAssignmentProperties + :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 RegistrationAssignment + or ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.managedservices.models.RegistrationAssignment] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.managedservices.models.RegistrationAssignment]] + :raises: + :class:`ErrorResponseException` + """ + raw_result = self._create_or_update_initial( + scope=scope, + registration_assignment_id=registration_assignment_id, + api_version=api_version, + properties=properties, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('RegistrationAssignment', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + 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_or_update.metadata = {'url': '/{scope}/providers/Microsoft.ManagedServices/registrationAssignments/{registrationAssignmentId}'} def list( diff --git a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_definitions_operations.py b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_definitions_operations.py index 2d349517f99..3a4c1204dde 100644 --- a/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_definitions_operations.py +++ b/sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/operations/registration_definitions_operations.py @@ -11,6 +11,8 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -113,9 +115,8 @@ def delete( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: RegistrationDefinition or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.managedservices.models.RegistrationDefinition or - ~msrest.pipeline.ClientRawResponse + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: :class:`ErrorResponseException` """ @@ -133,7 +134,6 @@ def delete( # 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: @@ -148,45 +148,14 @@ def delete( if response.status_code not in [200, 204]: raise models.ErrorResponseException(self._deserialize, response) - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('RegistrationDefinition', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - - return deserialized delete.metadata = {'url': '/{scope}/providers/Microsoft.ManagedServices/registrationDefinitions/{registrationDefinitionId}'} - def create_or_update( - self, registration_definition_id, api_version, scope, properties=None, plan=None, custom_headers=None, raw=False, **operation_config): - """Creates or updates a registration definition. - :param registration_definition_id: Guid of the registration - definition. - :type registration_definition_id: str - :param api_version: The API version to use for this operation. - :type api_version: str - :param scope: Scope of the resource. - :type scope: str - :param properties: Properties of a registration definition. - :type properties: - ~azure.mgmt.managedservices.models.RegistrationDefinitionProperties - :param plan: Plan details for the managed services. - :type plan: ~azure.mgmt.managedservices.models.Plan - :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: RegistrationDefinition or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.managedservices.models.RegistrationDefinition or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ + def _create_or_update_initial( + self, registration_definition_id, api_version, scope, properties=None, plan=None, custom_headers=None, raw=False, **operation_config): request_body = models.RegistrationDefinition(properties=properties, plan=plan) # Construct URL @@ -234,6 +203,64 @@ def create_or_update( return client_raw_response return deserialized + + def create_or_update( + self, registration_definition_id, api_version, scope, properties=None, plan=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates or updates a registration definition. + + :param registration_definition_id: Guid of the registration + definition. + :type registration_definition_id: str + :param api_version: The API version to use for this operation. + :type api_version: str + :param scope: Scope of the resource. + :type scope: str + :param properties: Properties of a registration definition. + :type properties: + ~azure.mgmt.managedservices.models.RegistrationDefinitionProperties + :param plan: Plan details for the managed services. + :type plan: ~azure.mgmt.managedservices.models.Plan + :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 RegistrationDefinition + or ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.managedservices.models.RegistrationDefinition] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.managedservices.models.RegistrationDefinition]] + :raises: + :class:`ErrorResponseException` + """ + raw_result = self._create_or_update_initial( + registration_definition_id=registration_definition_id, + api_version=api_version, + scope=scope, + properties=properties, + plan=plan, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('RegistrationDefinition', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + 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_or_update.metadata = {'url': '/{scope}/providers/Microsoft.ManagedServices/registrationDefinitions/{registrationDefinitionId}'} def list(