[AutoPR apimanagement/resource-manager] [Hub Generated] Review reques…

…t for Microsoft.ApiManagement to add version stable/2019-01-01 (#4826)

* Generated from 6d9246da16d91e7f3bbee8052551e189e9c24961

Rename and fixes for .Net client

* Generated from ccfe40bf845ae0078e1369d5110bbf97aa85d948

Fix for Api Export on 2019-01-01

* Generated from 6f97be08923dc01352f2285425ec2ca46a83ea47

Fix for Api Export on 2019-01-01

* Generated from 18c5892f6603d16b17e2a78868b90871fc5972b6

Fix GET User Token Contract

* Generated from 63ec8584379668d420e906190b9710a48e9f7159

Fix definition for Deploy, Save, AccessInformationUpdate

* Generated from ab0feb1a7675accf399edbf5a4c378d844dcb8fa

fix edits

* Generated from 71e167693019e8e657c456995331e3d7b5432a8f

update example for deployment

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py

@@ -15,6 +15,7 @@
     from .error_response_py3 import ErrorResponse, ErrorResponseException
     from .region_contract_py3 import RegionContract
     from .resource_py3 import Resource
+    from .api_export_result_value_py3 import ApiExportResultValue
     from .api_export_result_py3 import ApiExportResult
     from .product_entity_base_parameters_py3 import ProductEntityBaseParameters
     from .product_tag_resource_contract_properties_py3 import ProductTagResourceContractProperties
@@ -169,6 +170,7 @@
     from .error_response import ErrorResponse, ErrorResponseException
     from .region_contract import RegionContract
     from .resource import Resource
+    from .api_export_result_value import ApiExportResultValue
     from .api_export_result import ApiExportResult
     from .product_entity_base_parameters import ProductEntityBaseParameters
     from .product_tag_resource_contract_properties import ProductTagResourceContractProperties
@@ -352,6 +354,7 @@
 from .request_report_record_contract_paged import RequestReportRecordContractPaged
 from .user_identity_contract_paged import UserIdentityContractPaged
 from .api_management_client_enums import (
+    ExportResultFormat,
     ProductState,
     BearerTokenSendingMethods,
     Protocol,
@@ -394,6 +397,7 @@
     'ErrorResponse', 'ErrorResponseException',
     'RegionContract',
     'Resource',
+    'ApiExportResultValue',
     'ApiExportResult',
     'ProductEntityBaseParameters',
     'ProductTagResourceContractProperties',
@@ -576,6 +580,7 @@
     'ReportRecordContractPaged',
     'RequestReportRecordContractPaged',
     'UserIdentityContractPaged',
+    'ExportResultFormat',
     'ProductState',
     'BearerTokenSendingMethods',
     'Protocol',

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters.py

@@ -13,14 +13,14 @@
 
 
 class AccessInformationUpdateParameters(Model):
-    """Tenant access information update parameters of the API Management service.
+    """Tenant access information update parameters.
 
     :param enabled: Determines whether direct access is enabled.
     :type enabled: bool
     """
 
     _attribute_map = {
-        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'enabled': {'key': 'properties.enabled', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters_py3.py

@@ -13,14 +13,14 @@
 
 
 class AccessInformationUpdateParameters(Model):
-    """Tenant access information update parameters of the API Management service.
+    """Tenant access information update parameters.
 
     :param enabled: Determines whether direct access is enabled.
     :type enabled: bool
     """
 
     _attribute_map = {
-        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'enabled': {'key': 'properties.enabled', 'type': 'bool'},
     }
 
     def __init__(self, *, enabled: bool=None, **kwargs) -> None:

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result.py

@@ -13,17 +13,27 @@
 
 
 class ApiExportResult(Model):
-    """API Export result Blob Uri.
+    """API Export result.
 
-    :param link: Link to the Storage Blob containing the result of the export
-     operation. The Blob Uri is only valid for 5 minutes.
-    :type link: str
+    :param id: ResourceId of the API which was exported.
+    :type id: str
+    :param export_result_format: Format in which the Api Details are exported
+     to the Storage Blob with Sas Key valid for 5 minutes. Possible values
+     include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi'
+    :type export_result_format: str or
+     ~azure.mgmt.apimanagement.models.ExportResultFormat
+    :param value: The object defining the schema of the exported Api Detail
+    :type value: ~azure.mgmt.apimanagement.models.ApiExportResultValue
     """
 
     _attribute_map = {
-        'link': {'key': 'link', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'export_result_format': {'key': 'format', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'ApiExportResultValue'},
     }
 
     def __init__(self, **kwargs):
         super(ApiExportResult, self).__init__(**kwargs)
-        self.link = kwargs.get('link', None)
+        self.id = kwargs.get('id', None)
+        self.export_result_format = kwargs.get('export_result_format', None)
+        self.value = kwargs.get('value', None)

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_py3.py

@@ -13,17 +13,27 @@
 
 
 class ApiExportResult(Model):
-    """API Export result Blob Uri.
+    """API Export result.
 
-    :param link: Link to the Storage Blob containing the result of the export
-     operation. The Blob Uri is only valid for 5 minutes.
-    :type link: str
+    :param id: ResourceId of the API which was exported.
+    :type id: str
+    :param export_result_format: Format in which the Api Details are exported
+     to the Storage Blob with Sas Key valid for 5 minutes. Possible values
+     include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi'
+    :type export_result_format: str or
+     ~azure.mgmt.apimanagement.models.ExportResultFormat
+    :param value: The object defining the schema of the exported Api Detail
+    :type value: ~azure.mgmt.apimanagement.models.ApiExportResultValue
     """
 
     _attribute_map = {
-        'link': {'key': 'link', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'export_result_format': {'key': 'format', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'ApiExportResultValue'},
     }
 
-    def __init__(self, *, link: str=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, export_result_format=None, value=None, **kwargs) -> None:
         super(ApiExportResult, self).__init__(**kwargs)
-        self.link = link
+        self.id = id
+        self.export_result_format = export_result_format
+        self.value = value

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_value.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 ApiExportResultValue(Model):
+    """The object defining the schema of the exported Api Detail.
+
+    :param link: Link to the Storage Blob containing the result of the export
+     operation. The Blob Uri is only valid for 5 minutes.
+    :type link: str
+    """
+
+    _attribute_map = {
+        'link': {'key': 'link', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiExportResultValue, self).__init__(**kwargs)
+        self.link = kwargs.get('link', None)

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_value_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 ApiExportResultValue(Model):
+    """The object defining the schema of the exported Api Detail.
+
+    :param link: Link to the Storage Blob containing the result of the export
+     operation. The Blob Uri is only valid for 5 minutes.
+    :type link: str
+    """
+
+    _attribute_map = {
+        'link': {'key': 'link', 'type': 'str'},
+    }
+
+    def __init__(self, *, link: str=None, **kwargs) -> None:
+        super(ApiExportResultValue, self).__init__(**kwargs)
+        self.link = link

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py

@@ -12,6 +12,14 @@
 from enum import Enum
 
 
+class ExportResultFormat(str, Enum):
+
+    swagger = "swagger-link-json"  #: The Api Definition is exported in OpenApi Specification 2.0 format to the Storage Blob.
+    wsdl = "wsdl-link+xml"  #: The Api Definition is exported in WSDL Schema to Storage Blob. This is only supported for APIs of Type `soap`
+    wadl = "wadl-link-json"  #: Export the Api Definition in WADL Schema to Storage Blob.
+    open_api = "openapi-link"  #: Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.
+
+
 class ProductState(str, Enum):
 
     not_published = "notPublished"
@@ -277,4 +285,4 @@ class ExportFormat(str, Enum):
     swagger = "swagger-link"  #: Export the Api Definition in OpenApi Specification 2.0 format to the Storage Blob.
     wsdl = "wsdl-link"  #: Export the Api Definition in WSDL Schema to Storage Blob. This is only supported for APIs of Type `soap`
     wadl = "wadl-link"  #: Export the Api Definition in WADL Schema to Storage Blob.
-    open_api3 = "openapi-link"  #: Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.
+    openapi = "openapi-link"  #: Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties.py

@@ -84,8 +84,9 @@ class ApiManagementServiceBaseProperties(Model):
      list[~azure.mgmt.apimanagement.models.CertificateConfiguration]
     :param enable_client_certificate: Property only meant to be used for
      Consumption SKU Service. This enforces a client certificate to be
-     presented on each request to the gateway and enabled ability to
-     authenticate the certificate in the policy. Default value: False .
+     presented on each request to the gateway. This also enables the ability to
+     authenticate the certificate in the policy on the gateway. Default value:
+     False .
     :type enable_client_certificate: bool
     :param virtual_network_type: The type of VPN in which API Management
      service needs to be configured in. None (Default Value) means the API

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties_py3.py

@@ -84,8 +84,9 @@ class ApiManagementServiceBaseProperties(Model):
      list[~azure.mgmt.apimanagement.models.CertificateConfiguration]
     :param enable_client_certificate: Property only meant to be used for
      Consumption SKU Service. This enforces a client certificate to be
-     presented on each request to the gateway and enabled ability to
-     authenticate the certificate in the policy. Default value: False .
+     presented on each request to the gateway. This also enables the ability to
+     authenticate the certificate in the policy on the gateway. Default value:
+     False .
     :type enable_client_certificate: bool
     :param virtual_network_type: The type of VPN in which API Management
      service needs to be configured in. None (Default Value) means the API

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource.py

@@ -95,8 +95,9 @@ class ApiManagementServiceResource(ApimResource):
      list[~azure.mgmt.apimanagement.models.CertificateConfiguration]
     :param enable_client_certificate: Property only meant to be used for
      Consumption SKU Service. This enforces a client certificate to be
-     presented on each request to the gateway and enabled ability to
-     authenticate the certificate in the policy. Default value: False .
+     presented on each request to the gateway. This also enables the ability to
+     authenticate the certificate in the policy on the gateway. Default value:
+     False .
     :type enable_client_certificate: bool
     :param virtual_network_type: The type of VPN in which API Management
      service needs to be configured in. None (Default Value) means the API

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py

@@ -95,8 +95,9 @@ class ApiManagementServiceResource(ApimResource):
      list[~azure.mgmt.apimanagement.models.CertificateConfiguration]
     :param enable_client_certificate: Property only meant to be used for
      Consumption SKU Service. This enforces a client certificate to be
-     presented on each request to the gateway and enabled ability to
-     authenticate the certificate in the policy. Default value: False .
+     presented on each request to the gateway. This also enables the ability to
+     authenticate the certificate in the policy on the gateway. Default value:
+     False .
     :type enable_client_certificate: bool
     :param virtual_network_type: The type of VPN in which API Management
      service needs to be configured in. None (Default Value) means the API

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters.py

@@ -93,8 +93,9 @@ class ApiManagementServiceUpdateParameters(ApimResource):
      list[~azure.mgmt.apimanagement.models.CertificateConfiguration]
     :param enable_client_certificate: Property only meant to be used for
      Consumption SKU Service. This enforces a client certificate to be
-     presented on each request to the gateway and enabled ability to
-     authenticate the certificate in the policy. Default value: False .
+     presented on each request to the gateway. This also enables the ability to
+     authenticate the certificate in the policy on the gateway. Default value:
+     False .
     :type enable_client_certificate: bool
     :param virtual_network_type: The type of VPN in which API Management
      service needs to be configured in. None (Default Value) means the API

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py

@@ -93,8 +93,9 @@ class ApiManagementServiceUpdateParameters(ApimResource):
      list[~azure.mgmt.apimanagement.models.CertificateConfiguration]
     :param enable_client_certificate: Property only meant to be used for
      Consumption SKU Service. This enforces a client certificate to be
-     presented on each request to the gateway and enabled ability to
-     authenticate the certificate in the policy. Default value: False .
+     presented on each request to the gateway. This also enables the ability to
+     authenticate the certificate in the policy on the gateway. Default value:
+     False .
     :type enable_client_certificate: bool
     :param virtual_network_type: The type of VPN in which API Management
      service needs to be configured in. None (Default Value) means the API

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters.py

@@ -13,7 +13,7 @@
 
 
 class DeployConfigurationParameters(Model):
-    """Parameters supplied to the Deploy Configuration operation.
+    """Deploy Tenant Configuration Contract.
 
     All required parameters must be populated in order to send to Azure.
 
@@ -30,8 +30,8 @@ class DeployConfigurationParameters(Model):
     }
 
     _attribute_map = {
-        'branch': {'key': 'branch', 'type': 'str'},
-        'force': {'key': 'force', 'type': 'bool'},
+        'branch': {'key': 'properties.branch', 'type': 'str'},
+        'force': {'key': 'properties.force', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters_py3.py

@@ -13,7 +13,7 @@
 
 
 class DeployConfigurationParameters(Model):
-    """Parameters supplied to the Deploy Configuration operation.
+    """Deploy Tenant Configuration Contract.
 
     All required parameters must be populated in order to send to Azure.
 
@@ -30,8 +30,8 @@ class DeployConfigurationParameters(Model):
     }
 
     _attribute_map = {
-        'branch': {'key': 'branch', 'type': 'str'},
-        'force': {'key': 'force', 'type': 'bool'},
+        'branch': {'key': 'properties.branch', 'type': 'str'},
+        'force': {'key': 'properties.force', 'type': 'bool'},
     }
 
     def __init__(self, *, branch: str, force: bool=None, **kwargs) -> None:

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter.py

@@ -13,7 +13,7 @@
 
 
 class SaveConfigurationParameter(Model):
-    """Parameters supplied to the Save Tenant Configuration operation.
+    """Save Tenant Configuration Contract details.
 
     All required parameters must be populated in order to send to Azure.
 
@@ -31,8 +31,8 @@ class SaveConfigurationParameter(Model):
     }
 
     _attribute_map = {
-        'branch': {'key': 'branch', 'type': 'str'},
-        'force': {'key': 'force', 'type': 'bool'},
+        'branch': {'key': 'properties.branch', 'type': 'str'},
+        'force': {'key': 'properties.force', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter_py3.py

@@ -13,7 +13,7 @@
 
 
 class SaveConfigurationParameter(Model):
-    """Parameters supplied to the Save Tenant Configuration operation.
+    """Save Tenant Configuration Contract details.
 
     All required parameters must be populated in order to send to Azure.
 
@@ -31,8 +31,8 @@ class SaveConfigurationParameter(Model):
     }
 
     _attribute_map = {
-        'branch': {'key': 'branch', 'type': 'str'},
-        'force': {'key': 'force', 'type': 'bool'},
+        'branch': {'key': 'properties.branch', 'type': 'str'},
+        'force': {'key': 'properties.force', 'type': 'bool'},
     }
 
     def __init__(self, *, branch: str, force: bool=None, **kwargs) -> None:

azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters.py

@@ -13,7 +13,7 @@
 
 
 class UserTokenParameters(Model):
-    """Parameters supplied to the Get User Token operation.
+    """Get User Token parameters.
 
     All required parameters must be populated in order to send to Azure.
 
@@ -33,8 +33,8 @@ class UserTokenParameters(Model):
     }
 
     _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'KeyType'},
-        'expiry': {'key': 'expiry', 'type': 'iso-8601'},
+        'key_type': {'key': 'properties.keyType', 'type': 'KeyType'},
+        'expiry': {'key': 'properties.expiry', 'type': 'iso-8601'},
     }
 
     def __init__(self, **kwargs):