diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py index 1b7512b2e21f..dd12fa2c82bd 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py +++ b/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', diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters.py index 9e687a43fd01..89d3de07c5ae 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters.py +++ b/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): diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters_py3.py index bcfb60c31933..de481d924392 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/access_information_update_parameters_py3.py +++ b/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: diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result.py index dfe0f09e82d4..46f85d9a27af 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result.py +++ b/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) diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_py3.py index 4d2e2671fbf8..ac710fddacbd 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_py3.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_value.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_value.py new file mode 100644 index 000000000000..e0554a63b849 --- /dev/null +++ b/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) diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_value_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_export_result_value_py3.py new file mode 100644 index 000000000000..521bd611cb33 --- /dev/null +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py index 56d8c8c182da..9c50acb41627 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py +++ b/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. diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties.py index bcb92d273c50..7cf72fd0ab20 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties_py3.py index 77f5a910183f..cadc56f88b6b 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_base_properties_py3.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource.py index e3d6ad0a7e21..23867d44ffdf 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py index 3250ab246d16..8e2213108bd0 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters.py index e05286708efa..aca59f821f77 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py index 5bd51ffa466c..76a51b033344 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py +++ b/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 diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters.py index bc5fcb5f2210..3e3e7db3f36f 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters.py +++ b/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): diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters_py3.py index 83ee4ed79834..f7bf03929d4d 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/deploy_configuration_parameters_py3.py +++ b/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: diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter.py index 77d0e9db41c5..0350003491c4 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter.py +++ b/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): diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter_py3.py index 3c887ae64b03..fb5acd418212 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/save_configuration_parameter_py3.py +++ b/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: diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters.py index 09dce2f8d41b..e8092006538f 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters.py +++ b/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): diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters_py3.py index fb49f3fd030e..d0aecd5b2174 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters_py3.py +++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_token_parameters_py3.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, *, expiry, key_type="primary", **kwargs) -> None: diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py index 31674806ceca..18aa4a080a00 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py +++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py @@ -53,7 +53,7 @@ def get( :type api_id: str :param format: Format in which to export the Api Details to the Storage Blob with Sas Key valid for 5 minutes. Possible values - include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi3' + include: 'Swagger', 'Wsdl', 'Wadl', 'Openapi' :type format: str or ~azure.mgmt.apimanagement.models.ExportFormat :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py index 5052b1c1fb30..5f7313e5fdf4 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py +++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py @@ -294,8 +294,6 @@ def _create_or_update_initial( deserialized = self._deserialize('ApiManagementServiceResource', response) if response.status_code == 201: deserialized = self._deserialize('ApiManagementServiceResource', response) - if response.status_code == 202: - deserialized = self._deserialize('ApiManagementServiceResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py index 036de63f16aa..ce26d8d03aab 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py +++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py @@ -131,8 +131,8 @@ def check_entity_exists( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse + :return: bool or ClientRawResponse if raw=true + :rtype: bool or ~msrest.pipeline.ClientRawResponse :raises: :class:`ErrorResponseException` """ @@ -164,12 +164,14 @@ def check_entity_exists( request = self._client.head(url, query_parameters, header_parameters) response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [204]: + if response.status_code not in [204, 404]: raise models.ErrorResponseException(self._deserialize, response) + deserialized = (response.status_code == 204) if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response + return deserialized check_entity_exists.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}'} def create_or_update( diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py index 4c1b19a91811..7041ad6440a4 100644 --- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py +++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py @@ -132,8 +132,8 @@ def check_entity_exists( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse + :return: bool or ClientRawResponse if raw=true + :rtype: bool or ~msrest.pipeline.ClientRawResponse :raises: :class:`ErrorResponseException` """ @@ -165,12 +165,14 @@ def check_entity_exists( request = self._client.head(url, query_parameters, header_parameters) response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [204]: + if response.status_code not in [204, 404]: raise models.ErrorResponseException(self._deserialize, response) + deserialized = (response.status_code == 204) if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response + return deserialized check_entity_exists.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}'} def create_or_update(