[AutoPR deviceprovisioningservices/resource-manager] Group DPSCertificate->List with other operations

azure-mgmt-iothubprovisioningservices/azure/mgmt/iothubprovisioningservices/iot_dps_client.py

@@ -16,7 +16,6 @@
 from .operations.operations import Operations
 from .operations.dps_certificate_operations import DpsCertificateOperations
 from .operations.iot_dps_resource_operations import IotDpsResourceOperations
-from .operations.dps_certificates_operations import DpsCertificatesOperations
 from . import models
 
 
@@ -64,8 +63,6 @@ class IotDpsClient(object):
     :vartype dps_certificate: azure.mgmt.iothubprovisioningservices.operations.DpsCertificateOperations
     :ivar iot_dps_resource: IotDpsResource operations
     :vartype iot_dps_resource: azure.mgmt.iothubprovisioningservices.operations.IotDpsResourceOperations
-    :ivar dps_certificates: DpsCertificates operations
-    :vartype dps_certificates: azure.mgmt.iothubprovisioningservices.operations.DpsCertificatesOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -92,5 +89,3 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.iot_dps_resource = IotDpsResourceOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.dps_certificates = DpsCertificatesOperations(
-            self._client, self.config, self._serialize, self._deserialize)

azure-mgmt-iothubprovisioningservices/azure/mgmt/iothubprovisioningservices/operations/__init__.py

@@ -12,11 +12,9 @@
 from .operations import Operations
 from .dps_certificate_operations import DpsCertificateOperations
 from .iot_dps_resource_operations import IotDpsResourceOperations
-from .dps_certificates_operations import DpsCertificatesOperations
 
 __all__ = [
     'Operations',
     'DpsCertificateOperations',
     'IotDpsResourceOperations',
-    'DpsCertificatesOperations',
 ]

azure-mgmt-iothubprovisioningservices/azure/mgmt/iothubprovisioningservices/operations/dps_certificate_operations.py

@@ -21,7 +21,7 @@ class DpsCertificateOperations(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: The version of the API. Constant value: "2017-11-15".
     """
 
@@ -62,7 +62,7 @@ def get(
          :class:`ErrorDetailsException<azure.mgmt.iothubprovisioningservices.models.ErrorDetailsException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
@@ -104,6 +104,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}'}
 
     def create_or_update(
             self, resource_group_name, provisioning_service_name, certificate_name, if_match=None, certificate=None, custom_headers=None, raw=False, **operation_config):
@@ -140,7 +141,7 @@ def create_or_update(
         certificate_description = models.CertificateBodyDescription(certificate=certificate)
 
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -186,6 +187,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}'}
 
     def delete(
             self, resource_group_name, if_match, provisioning_service_name, certificate_name, certificatename=None, certificateraw_bytes=None, certificateis_verified=None, certificatepurpose=None, certificatecreated=None, certificatelast_updated=None, certificatehas_private_key=None, certificatenonce=None, custom_headers=None, raw=False, **operation_config):
@@ -238,7 +240,7 @@ def delete(
          :class:`ErrorDetailsException<azure.mgmt.iothubprovisioningservices.models.ErrorDetailsException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -288,6 +290,70 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}'}
+
+    def list(
+            self, resource_group_name, provisioning_service_name, custom_headers=None, raw=False, **operation_config):
+        """Get all the certificates tied to the provisioning service.
+
+        :param resource_group_name: Name of resource group.
+        :type resource_group_name: str
+        :param provisioning_service_name: Name of provisioning service to
+         retrieve certificates for.
+        :type provisioning_service_name: 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<msrest:optionsforoperations>`.
+        :return: CertificateListDescription or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.iothubprovisioningservices.models.CertificateListDescription
+         or ~msrest.pipeline.ClientRawResponse
+        :raises:
+         :class:`ErrorDetailsException<azure.mgmt.iothubprovisioningservices.models.ErrorDetailsException>`
+        """
+        # Construct URL
+        url = self.list.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'provisioningServiceName': self._serialize.url("provisioning_service_name", provisioning_service_name, '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['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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorDetailsException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('CertificateListDescription', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates'}
 
     def generate_verification_code(
             self, certificate_name, if_match, resource_group_name, provisioning_service_name, certificatename=None, certificateraw_bytes=None, certificateis_verified=None, certificatepurpose=None, certificatecreated=None, certificatelast_updated=None, certificatehas_private_key=None, certificatenonce=None, custom_headers=None, raw=False, **operation_config):
@@ -339,7 +405,7 @@ def generate_verification_code(
          :class:`ErrorDetailsException<azure.mgmt.iothubprovisioningservices.models.ErrorDetailsException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}/generateVerificationCode'
+        url = self.generate_verification_code.metadata['url']
         path_format_arguments = {
             'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
@@ -396,6 +462,7 @@ def generate_verification_code(
             return client_raw_response
 
         return deserialized
+    generate_verification_code.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}/generateVerificationCode'}
 
     def verify_certificate(
             self, certificate_name, if_match, resource_group_name, provisioning_service_name, certificatename=None, certificateraw_bytes=None, certificateis_verified=None, certificatepurpose=None, certificatecreated=None, certificatelast_updated=None, certificatehas_private_key=None, certificatenonce=None, certificate=None, custom_headers=None, raw=False, **operation_config):
@@ -453,7 +520,7 @@ def verify_certificate(
         request = models.VerificationCodeRequest(certificate=certificate)
 
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}/verify'
+        url = self.verify_certificate.metadata['url']
         path_format_arguments = {
             'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
@@ -514,3 +581,4 @@ def verify_certificate(
             return client_raw_response
 
         return deserialized
+    verify_certificate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/provisioningServices/{provisioningServiceName}/certificates/{certificateName}/verify'}