[AutoPR subscription/resource-manager] Update subscription creation ARM API in Microsoft.Subscription RP

azure-mgmt-subscription/azure/mgmt/subscription/models/error_response.py

@@ -28,6 +28,7 @@ class ErrorResponse(Model):
     }
 
     def __init__(self, code=None, message=None):
+        super(ErrorResponse, self).__init__()
         self.code = code
         self.message = message
 

azure-mgmt-subscription/azure/mgmt/subscription/models/location.py

@@ -52,6 +52,7 @@ class Location(Model):
     }
 
     def __init__(self):
+        super(Location, self).__init__()
         self.id = None
         self.subscription_id = None
         self.name = None

azure-mgmt-subscription/azure/mgmt/subscription/models/operation.py

@@ -27,5 +27,6 @@ class Operation(Model):
     }
 
     def __init__(self, name=None, display=None):
+        super(Operation, self).__init__()
         self.name = name
         self.display = display

azure-mgmt-subscription/azure/mgmt/subscription/models/operation_display.py

@@ -31,6 +31,7 @@ class OperationDisplay(Model):
     }
 
     def __init__(self, provider=None, resource=None, operation=None):
+        super(OperationDisplay, self).__init__()
         self.provider = provider
         self.resource = resource
         self.operation = operation

azure-mgmt-subscription/azure/mgmt/subscription/models/subscription.py

@@ -55,6 +55,7 @@ class Subscription(Model):
     }
 
     def __init__(self, subscription_policies=None, authorization_source=None):
+        super(Subscription, self).__init__()
         self.id = None
         self.subscription_id = None
         self.display_name = None

azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_definition.py

@@ -54,6 +54,7 @@ class SubscriptionDefinition(Model):
     }
 
     def __init__(self, subscription_display_name=None, offer_type=None, etag=None):
+        super(SubscriptionDefinition, self).__init__()
         self.id = None
         self.name = None
         self.type = None

azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_policies.py

@@ -44,6 +44,7 @@ class SubscriptionPolicies(Model):
     }
 
     def __init__(self):
+        super(SubscriptionPolicies, self).__init__()
         self.location_placement_id = None
         self.quota_id = None
         self.spending_limit = None

azure-mgmt-subscription/azure/mgmt/subscription/models/tenant_id_description.py

@@ -37,5 +37,6 @@ class TenantIdDescription(Model):
     }
 
     def __init__(self):
+        super(TenantIdDescription, self).__init__()
         self.id = None
         self.tenant_id = None

azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_definitions_operation_metadata_operations.py

@@ -21,7 +21,7 @@ class SubscriptionDefinitionsOperationMetadataOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :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: "2017-11-01-preview".
     """
 
@@ -55,7 +55,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/providers/Microsoft.Subscription/operations'
+                url = self.list.metadata['url']
 
                 # Construct parameters
                 query_parameters = {}
@@ -78,7 +78,7 @@ def internal_paging(next_link=None, raw=False):
             # Construct and send request
             request = self._client.get(url, query_parameters)
             response = self._client.send(
-                request, header_parameters, **operation_config)
+                request, header_parameters, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 raise models.ErrorResponseException(self._deserialize, response)
@@ -94,3 +94,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Subscription/operations'}

azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_definitions_operations.py

@@ -12,6 +12,7 @@
 import uuid
 from msrest.pipeline import ClientRawResponse
 from msrestazure.azure_exceptions import CloudError
+from msrest.exceptions import DeserializationError
 from msrestazure.azure_operation import AzureOperationPoller
 
 from .. import models
@@ -23,7 +24,7 @@ class SubscriptionDefinitionsOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :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: "2017-11-01-preview".
     """
 
@@ -38,28 +39,11 @@ def __init__(self, client, config, serializer, deserializer):
 
         self.config = config
 
-    def create(
-            self, subscription_definition_name, body, custom_headers=None, raw=False, **operation_config):
-        """Create an Azure subscription definition.
 
-        :param subscription_definition_name: The name of the Azure
-         subscription definition.
-        :type subscription_definition_name: str
-        :param body: The subscription definition creation.
-        :type body: ~azure.mgmt.subscription.models.SubscriptionDefinition
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :return: An instance of AzureOperationPoller that returns
-         SubscriptionDefinition or ClientRawResponse if raw=true
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.subscription.models.SubscriptionDefinition]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.subscription.models.ErrorResponseException>`
-        """
+    def _create_initial(
+            self, subscription_definition_name, body, custom_headers=None, raw=False, **operation_config):
         # Construct URL
-        url = '/providers/Microsoft.Subscription/subscriptionDefinitions/{subscriptionDefinitionName}'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'subscriptionDefinitionName': self._serialize.url("subscription_definition_name", subscription_definition_name, 'str')
         }
@@ -83,34 +67,87 @@ def create(
         body_content = self._serialize.body(body, 'SubscriptionDefinition')
 
         # Construct and send request
-        def long_running_send():
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
 
-            request = self._client.put(url, query_parameters)
-            return self._client.send(
-                request, header_parameters, body_content, **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('SubscriptionDefinition', response)
+            header_dict = {
+                'Location': 'str',
+                'Retry-After': 'str',
+            }
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            try:
+                client_raw_response.add_headers(header_dict)
+            except DeserializationError:
+                pass # Deserialization of Headers here can fail
+            return client_raw_response
+
+        return deserialized
+
+    def create(
+            self, subscription_definition_name, body, custom_headers=None, raw=False, **operation_config):
+        """Create an Azure subscription definition.
+
+        :param subscription_definition_name: The name of the Azure
+         subscription definition.
+        :type subscription_definition_name: str
+        :param body: The subscription definition creation.
+        :type body: ~azure.mgmt.subscription.models.SubscriptionDefinition
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :return: An instance of AzureOperationPoller that returns
+         SubscriptionDefinition or ClientRawResponse if raw=true
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.subscription.models.SubscriptionDefinition]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.subscription.models.ErrorResponseException>`
+        """
+        raw_result = self._create_initial(
+            subscription_definition_name=subscription_definition_name,
+            body=body,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+        if raw:
+            return raw_result
+
+        # Construct and send request
+        def long_running_send():
+            return raw_result.response
 
         def get_long_running_status(status_link, headers=None):
 
             request = self._client.get(status_link)
             if headers:
                 request.headers.update(headers)
+            header_parameters = {}
+            header_parameters['x-ms-client-request-id'] = raw_result.response.request.headers['x-ms-client-request-id']
             return self._client.send(
-                request, header_parameters, **operation_config)
+                request, header_parameters, stream=False, **operation_config)
 
         def get_long_running_output(response):
 
             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('SubscriptionDefinition', response)
-                header_dict = {
-                    'Location': 'str',
-                    'Retry-After': 'str',
-                }
+            header_dict = {
+                'Location': 'str',
+                'Retry-After': 'str',
+            }
+            deserialized = self._deserialize('SubscriptionDefinition', response)
 
             if raw:
                 client_raw_response = ClientRawResponse(deserialized, response)
@@ -119,16 +156,13 @@ def get_long_running_output(response):
 
             return deserialized
 
-        if raw:
-            response = long_running_send()
-            return get_long_running_output(response)
-
         long_running_operation_timeout = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
         return AzureOperationPoller(
             long_running_send, get_long_running_output,
             get_long_running_status, long_running_operation_timeout)
+    create.metadata = {'url': '/providers/Microsoft.Subscription/subscriptionDefinitions/{subscriptionDefinitionName}'}
 
     def get(
             self, subscription_definition_name, custom_headers=None, raw=False, **operation_config):
@@ -149,7 +183,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.subscription.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/providers/Microsoft.Subscription/subscriptionDefinitions/{subscriptionDefinitionName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'subscriptionDefinitionName': self._serialize.url("subscription_definition_name", subscription_definition_name, 'str')
         }
@@ -171,7 +205,7 @@ def get(
 
         # Construct and send request
         request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, **operation_config)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorResponseException(self._deserialize, response)
@@ -186,6 +220,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/providers/Microsoft.Subscription/subscriptionDefinitions/{subscriptionDefinitionName}'}
 
     def list(
             self, custom_headers=None, raw=False, **operation_config):
@@ -206,7 +241,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/providers/Microsoft.Subscription/subscriptionDefinitions'
+                url = self.list.metadata['url']
 
                 # Construct parameters
                 query_parameters = {}
@@ -229,7 +264,7 @@ def internal_paging(next_link=None, raw=False):
             # Construct and send request
             request = self._client.get(url, query_parameters)
             response = self._client.send(
-                request, header_parameters, **operation_config)
+                request, header_parameters, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 raise models.ErrorResponseException(self._deserialize, response)
@@ -245,6 +280,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Subscription/subscriptionDefinitions'}
 
     def get_operation_status(
             self, operation_id, custom_headers=None, raw=False, **operation_config):
@@ -266,7 +302,7 @@ def get_operation_status(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/providers/Microsoft.Subscription/subscriptionOperations/{operationId}'
+        url = self.get_operation_status.metadata['url']
         path_format_arguments = {
             'operationId': self._serialize.url("operation_id", operation_id, 'str')
         }
@@ -288,7 +324,7 @@ def get_operation_status(
 
         # Construct and send request
         request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, **operation_config)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
         if response.status_code not in [200, 202]:
             exp = CloudError(response)
@@ -311,3 +347,4 @@ def get_operation_status(
             return client_raw_response
 
         return deserialized
+    get_operation_status.metadata = {'url': '/providers/Microsoft.Subscription/subscriptionOperations/{operationId}'}