CodeGen from PR 11859 in Azure/azure-rest-api-specs

Merge 091ad6a55ec321c52832d10be022ede6b6021d83 into b6d64aa

sdk/apimanagement/azure-mgmt-apimanagement/azure/mgmt/apimanagement/_api_management_client.py

@@ -33,6 +33,9 @@
 from .operations import BackendOperations
 from .operations import CacheOperations
 from .operations import CertificateOperations
+from .operations import ContentTypeOperations
+from .operations import ContentItemOperations
+from .operations import DeletedServicesOperations
 from .operations import ApiManagementOperations
 from .operations import ApiManagementServiceSkusOperations
 from .operations import ApiManagementServiceOperations
@@ -126,6 +129,12 @@ class ApiManagementClient(SDKClient):
     :vartype cache: azure.mgmt.apimanagement.operations.CacheOperations
     :ivar certificate: Certificate operations
     :vartype certificate: azure.mgmt.apimanagement.operations.CertificateOperations
+    :ivar content_type: ContentType operations
+    :vartype content_type: azure.mgmt.apimanagement.operations.ContentTypeOperations
+    :ivar content_item: ContentItem operations
+    :vartype content_item: azure.mgmt.apimanagement.operations.ContentItemOperations
+    :ivar deleted_services: DeletedServices operations
+    :vartype deleted_services: azure.mgmt.apimanagement.operations.DeletedServicesOperations
     :ivar api_management_operations: ApiManagementOperations operations
     :vartype api_management_operations: azure.mgmt.apimanagement.operations.ApiManagementOperations
     :ivar api_management_service_skus: ApiManagementServiceSkus operations
@@ -232,7 +241,7 @@ def __init__(
         super(ApiManagementClient, 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 = '2019-12-01'
+        self.api_version = '2020-06-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -276,6 +285,12 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.certificate = CertificateOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.content_type = ContentTypeOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.content_item = ContentItemOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.deleted_services = DeletedServicesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.api_management_operations = ApiManagementOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.api_management_service_skus = ApiManagementServiceSkusOperations(

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

@@ -45,6 +45,7 @@
     from ._models_py3 import AuthenticationSettingsContract
     from ._models_py3 import AuthorizationServerContract
     from ._models_py3 import AuthorizationServerContractBaseProperties
+    from ._models_py3 import AuthorizationServerSecretsContract
     from ._models_py3 import AuthorizationServerUpdateContract
     from ._models_py3 import BackendAuthorizationHeaderCredentials
     from ._models_py3 import BackendBaseParameters
@@ -65,6 +66,11 @@
     from ._models_py3 import CertificateInformation
     from ._models_py3 import ClientSecretContract
     from ._models_py3 import ConnectivityStatusContract
+    from ._models_py3 import ContentItemContract
+    from ._models_py3 import ContentTypeContract
+    from ._models_py3 import DataMasking
+    from ._models_py3 import DataMaskingEntity
+    from ._models_py3 import DeletedServiceContract
     from ._models_py3 import DeployConfigurationParameters
     from ._models_py3 import DiagnosticContract
     from ._models_py3 import EmailTemplateContract
@@ -95,11 +101,15 @@
     from ._models_py3 import IssueContract
     from ._models_py3 import IssueContractBaseProperties
     from ._models_py3 import IssueUpdateContract
+    from ._models_py3 import KeyVaultContractCreateProperties
+    from ._models_py3 import KeyVaultContractProperties
+    from ._models_py3 import KeyVaultLastAccessStatusContractProperties
     from ._models_py3 import LoggerContract
     from ._models_py3 import LoggerUpdateContract
     from ._models_py3 import NamedValueContract
     from ._models_py3 import NamedValueCreateContract
     from ._models_py3 import NamedValueEntityBaseParameters
+    from ._models_py3 import NamedValueSecretContract
     from ._models_py3 import NamedValueUpdateParameters
     from ._models_py3 import NetworkStatusContract
     from ._models_py3 import NetworkStatusContractByLocation
@@ -130,11 +140,11 @@
     from ._models_py3 import ProductEntityBaseParameters
     from ._models_py3 import ProductTagResourceContractProperties
     from ._models_py3 import ProductUpdateParameters
-    from ._models_py3 import PropertyValueContract
     from ._models_py3 import QuotaCounterCollection
     from ._models_py3 import QuotaCounterContract
     from ._models_py3 import QuotaCounterValueContract
     from ._models_py3 import QuotaCounterValueContractProperties
+    from ._models_py3 import QuotaCounterValueUpdateContract
     from ._models_py3 import RecipientEmailCollection
     from ._models_py3 import RecipientEmailContract
     from ._models_py3 import RecipientsContractProperties
@@ -216,6 +226,7 @@
     from ._models import AuthenticationSettingsContract
     from ._models import AuthorizationServerContract
     from ._models import AuthorizationServerContractBaseProperties
+    from ._models import AuthorizationServerSecretsContract
     from ._models import AuthorizationServerUpdateContract
     from ._models import BackendAuthorizationHeaderCredentials
     from ._models import BackendBaseParameters
@@ -236,6 +247,11 @@
     from ._models import CertificateInformation
     from ._models import ClientSecretContract
     from ._models import ConnectivityStatusContract
+    from ._models import ContentItemContract
+    from ._models import ContentTypeContract
+    from ._models import DataMasking
+    from ._models import DataMaskingEntity
+    from ._models import DeletedServiceContract
     from ._models import DeployConfigurationParameters
     from ._models import DiagnosticContract
     from ._models import EmailTemplateContract
@@ -266,11 +282,15 @@
     from ._models import IssueContract
     from ._models import IssueContractBaseProperties
     from ._models import IssueUpdateContract
+    from ._models import KeyVaultContractCreateProperties
+    from ._models import KeyVaultContractProperties
+    from ._models import KeyVaultLastAccessStatusContractProperties
     from ._models import LoggerContract
     from ._models import LoggerUpdateContract
     from ._models import NamedValueContract
     from ._models import NamedValueCreateContract
     from ._models import NamedValueEntityBaseParameters
+    from ._models import NamedValueSecretContract
     from ._models import NamedValueUpdateParameters
     from ._models import NetworkStatusContract
     from ._models import NetworkStatusContractByLocation
@@ -301,11 +321,11 @@
     from ._models import ProductEntityBaseParameters
     from ._models import ProductTagResourceContractProperties
     from ._models import ProductUpdateParameters
-    from ._models import PropertyValueContract
     from ._models import QuotaCounterCollection
     from ._models import QuotaCounterContract
     from ._models import QuotaCounterValueContract
     from ._models import QuotaCounterValueContractProperties
+    from ._models import QuotaCounterValueUpdateContract
     from ._models import RecipientEmailCollection
     from ._models import RecipientEmailContract
     from ._models import RecipientsContractProperties
@@ -360,6 +380,9 @@
 from ._paged_models import BackendContractPaged
 from ._paged_models import CacheContractPaged
 from ._paged_models import CertificateContractPaged
+from ._paged_models import ContentItemContractPaged
+from ._paged_models import ContentTypeContractPaged
+from ._paged_models import DeletedServiceContractPaged
 from ._paged_models import DiagnosticContractPaged
 from ._paged_models import EmailTemplateContractPaged
 from ._paged_models import GatewayContractPaged
@@ -396,10 +419,12 @@
     SoapApiType,
     ApiType,
     State,
+    DataMaskingMode,
     SamplingType,
     AlwaysLog,
     HttpCorrelationProtocol,
     Verbosity,
+    OperationNameFormat,
     PolicyContentFormat,
     VersioningScheme,
     GrantType,
@@ -467,6 +492,7 @@
     'AuthenticationSettingsContract',
     'AuthorizationServerContract',
     'AuthorizationServerContractBaseProperties',
+    'AuthorizationServerSecretsContract',
     'AuthorizationServerUpdateContract',
     'BackendAuthorizationHeaderCredentials',
     'BackendBaseParameters',
@@ -487,6 +513,11 @@
     'CertificateInformation',
     'ClientSecretContract',
     'ConnectivityStatusContract',
+    'ContentItemContract',
+    'ContentTypeContract',
+    'DataMasking',
+    'DataMaskingEntity',
+    'DeletedServiceContract',
     'DeployConfigurationParameters',
     'DiagnosticContract',
     'EmailTemplateContract',
@@ -517,11 +548,15 @@
     'IssueContract',
     'IssueContractBaseProperties',
     'IssueUpdateContract',
+    'KeyVaultContractCreateProperties',
+    'KeyVaultContractProperties',
+    'KeyVaultLastAccessStatusContractProperties',
     'LoggerContract',
     'LoggerUpdateContract',
     'NamedValueContract',
     'NamedValueCreateContract',
     'NamedValueEntityBaseParameters',
+    'NamedValueSecretContract',
     'NamedValueUpdateParameters',
     'NetworkStatusContract',
     'NetworkStatusContractByLocation',
@@ -552,11 +587,11 @@
     'ProductEntityBaseParameters',
     'ProductTagResourceContractProperties',
     'ProductUpdateParameters',
-    'PropertyValueContract',
     'QuotaCounterCollection',
     'QuotaCounterContract',
     'QuotaCounterValueContract',
     'QuotaCounterValueContractProperties',
+    'QuotaCounterValueUpdateContract',
     'RecipientEmailCollection',
     'RecipientEmailContract',
     'RecipientsContractProperties',
@@ -620,6 +655,9 @@
     'BackendContractPaged',
     'CacheContractPaged',
     'CertificateContractPaged',
+    'ContentTypeContractPaged',
+    'ContentItemContractPaged',
+    'DeletedServiceContractPaged',
     'OperationPaged',
     'ResourceSkuResultPaged',
     'ApiManagementServiceResourcePaged',
@@ -646,10 +684,12 @@
     'SoapApiType',
     'ApiType',
     'State',
+    'DataMaskingMode',
     'SamplingType',
     'AlwaysLog',
     'HttpCorrelationProtocol',
     'Verbosity',
+    'OperationNameFormat',
     'PolicyContentFormat',
     'VersioningScheme',
     'GrantType',

sdk/apimanagement/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/_api_management_client_enums.py

@@ -42,14 +42,14 @@ class ContentFormat(str, Enum):
 
     wadl_xml = "wadl-xml"  #: The contents are inline and Content type is a WADL document.
     wadl_link_json = "wadl-link-json"  #: The WADL document is hosted on a publicly accessible internet address.
-    swagger_json = "swagger-json"  #: The contents are inline and Content Type is a OpenApi 2.0 Document.
-    swagger_link_json = "swagger-link-json"  #: The Open Api 2.0 document is hosted on a publicly accessible internet address.
+    swagger_json = "swagger-json"  #: The contents are inline and Content Type is a OpenAPI 2.0 JSON Document.
+    swagger_link_json = "swagger-link-json"  #: The OpenAPI 2.0 JSON document is hosted on a publicly accessible internet address.
     wsdl = "wsdl"  #: The contents are inline and the document is a WSDL/Soap document.
     wsdl_link = "wsdl-link"  #: The WSDL document is hosted on a publicly accessible internet address.
-    openapi = "openapi"  #: The contents are inline and Content Type is a OpenApi 3.0 Document in YAML format.
-    openapijson = "openapi+json"  #: The contents are inline and Content Type is a OpenApi 3.0 Document in JSON format.
-    openapi_link = "openapi-link"  #: The Open Api 3.0 document is hosted on a publicly accessible internet address.
-    openapijson_link = "openapi+json-link"  #: The Open Api 3.0 Json document is hosted on a publicly accessible internet address.
+    openapi = "openapi"  #: The contents are inline and Content Type is a OpenAPI 3.0 YAML Document.
+    openapijson = "openapi+json"  #: The contents are inline and Content Type is a OpenAPI 3.0 JSON Document.
+    openapi_link = "openapi-link"  #: The OpenAPI 3.0 YAML document is hosted on a publicly accessible internet address.
+    openapijson_link = "openapi+json-link"  #: The OpenAPI 3.0 JSON document is hosted on a publicly accessible internet address.
 
 
 class SoapApiType(str, Enum):
@@ -73,6 +73,12 @@ class State(str, Enum):
     closed = "closed"  #: The issue was closed.
 
 
+class DataMaskingMode(str, Enum):
+
+    mask = "Mask"  #: Mask the value of an entity.
+    hide = "Hide"  #: Hide the presence of an entity.
+
+
 class SamplingType(str, Enum):
 
     fixed = "fixed"  #: Fixed-rate sampling.
@@ -97,6 +103,12 @@ class Verbosity(str, Enum):
     error = "error"  #: Only traces with 'severity' set to 'error' will be sent to the logger attached to this diagnostic instance.
 
 
+class OperationNameFormat(str, Enum):
+
+    name = "Name"  #: API_NAME;rev=API_REVISION - OPERATION_NAME
+    url = "Url"  #: HTTP_VERB URL
+
+
 class PolicyContentFormat(str, Enum):
 
     xml = "xml"  #: The contents are inline and Content type is an XML document.
@@ -157,6 +169,7 @@ class SkuType(str, Enum):
     premium = "Premium"  #: Premium SKU of Api Management.
     basic = "Basic"  #: Basic SKU of Api Management.
     consumption = "Consumption"  #: Consumption SKU of Api Management.
+    isolated = "Isolated"  #: Isolated SKU of Api Management.
 
 
 class ResourceSkuCapacityScaleType(str, Enum):
@@ -210,6 +223,7 @@ class KeyType(str, Enum):
 
 class AppType(str, Enum):
 
+    portal = "portal"  #: User create request was sent by legacy developer portal.
     developer_portal = "developerPortal"  #: User create request was sent by new developer portal.
 
 
@@ -248,6 +262,7 @@ class LoggerType(str, Enum):
 
     azure_event_hub = "azureEventHub"  #: Azure Event Hub as log destination.
     application_insights = "applicationInsights"  #: Azure Application Insights as log destination.
+    azure_monitor = "azureMonitor"  #: Azure Monitor
 
 
 class ConnectivityStatusType(str, Enum):
@@ -321,8 +336,8 @@ class PolicyScopeContract(str, Enum):
 
 class ExportFormat(str, Enum):
 
-    swagger = "swagger-link"  #: Export the Api Definition in OpenApi Specification 2.0 format to the Storage Blob.
+    swagger = "swagger-link"  #: Export the Api Definition in OpenAPI 2.0 Specification as JSON document 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.
-    openapi = "openapi-link"  #: Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.
-    openapi_json = "openapi+json-link"  #: Export the Api Definition in OpenApi Specification 3.0 as JSON document to Storage Blob.
+    openapi = "openapi-link"  #: Export the Api Definition in OpenAPI 3.0 Specification as YAML document to Storage Blob.
+    openapi_json = "openapi+json-link"  #: Export the Api Definition in OpenAPI 3.0 Specification as JSON document to Storage Blob.