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

Merge 2d4b43e6f3c3f9fee0076fbaeed161b5b481c9a2 into 3d2e43a74af3670fec011540bb55ac1523f3ed59

sdk/apimanagement/azure-mgmt-apimanagement/MANIFEST.in

@@ -1,3 +1,4 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py

sdk/apimanagement/azure-mgmt-apimanagement/_meta.json

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "b844512ebddc5f9a396a52063c426282b4d5c4d7",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/apimanagement/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2",
+  "readme": "specification/apimanagement/resource-manager/readme.md"
+}

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

@@ -256,7 +256,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 = '2020-12-01'
+        self.api_version = '2021-04-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

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

@@ -15,13 +15,15 @@
     from ._models_py3 import AccessInformationSecretsContract
     from ._models_py3 import AccessInformationUpdateParameters
     from ._models_py3 import AdditionalLocation
+    from ._models_py3 import ApiContactInformation
     from ._models_py3 import ApiContract
     from ._models_py3 import ApiContractProperties
     from ._models_py3 import ApiCreateOrUpdateParameter
     from ._models_py3 import ApiCreateOrUpdatePropertiesWsdlSelector
     from ._models_py3 import ApiEntityBaseContract
     from ._models_py3 import ApiExportResult
     from ._models_py3 import ApiExportResultValue
+    from ._models_py3 import ApiLicenseInformation
     from ._models_py3 import ApiManagementServiceApplyNetworkConfigurationParameters
     from ._models_py3 import ApiManagementServiceBackupRestoreParameters
     from ._models_py3 import ApiManagementServiceBaseProperties
@@ -186,6 +188,7 @@
     from ._models_py3 import SubscriptionKeysContract
     from ._models_py3 import SubscriptionsDelegationSettingsProperties
     from ._models_py3 import SubscriptionUpdateParameters
+    from ._models_py3 import SystemData
     from ._models_py3 import TagContract
     from ._models_py3 import TagCreateUpdateParameters
     from ._models_py3 import TagDescriptionContract
@@ -212,13 +215,15 @@
     from ._models import AccessInformationSecretsContract
     from ._models import AccessInformationUpdateParameters
     from ._models import AdditionalLocation
+    from ._models import ApiContactInformation
     from ._models import ApiContract
     from ._models import ApiContractProperties
     from ._models import ApiCreateOrUpdateParameter
     from ._models import ApiCreateOrUpdatePropertiesWsdlSelector
     from ._models import ApiEntityBaseContract
     from ._models import ApiExportResult
     from ._models import ApiExportResultValue
+    from ._models import ApiLicenseInformation
     from ._models import ApiManagementServiceApplyNetworkConfigurationParameters
     from ._models import ApiManagementServiceBackupRestoreParameters
     from ._models import ApiManagementServiceBaseProperties
@@ -383,6 +388,7 @@
     from ._models import SubscriptionKeysContract
     from ._models import SubscriptionsDelegationSettingsProperties
     from ._models import SubscriptionUpdateParameters
+    from ._models import SystemData
     from ._models import TagContract
     from ._models import TagCreateUpdateParameters
     from ._models import TagDescriptionContract
@@ -472,8 +478,12 @@
     SkuType,
     ResourceSkuCapacityScaleType,
     HostnameType,
+    CertificateSource,
+    CertificateStatus,
+    PublicNetworkAccess,
     VirtualNetworkType,
     ApimIdentityType,
+    CreatedByType,
     NameAvailabilityReason,
     ProvisioningState,
     KeyType,
@@ -504,13 +514,15 @@
     'AccessInformationSecretsContract',
     'AccessInformationUpdateParameters',
     'AdditionalLocation',
+    'ApiContactInformation',
     'ApiContract',
     'ApiContractProperties',
     'ApiCreateOrUpdateParameter',
     'ApiCreateOrUpdatePropertiesWsdlSelector',
     'ApiEntityBaseContract',
     'ApiExportResult',
     'ApiExportResultValue',
+    'ApiLicenseInformation',
     'ApiManagementServiceApplyNetworkConfigurationParameters',
     'ApiManagementServiceBackupRestoreParameters',
     'ApiManagementServiceBaseProperties',
@@ -675,6 +687,7 @@
     'SubscriptionKeysContract',
     'SubscriptionsDelegationSettingsProperties',
     'SubscriptionUpdateParameters',
+    'SystemData',
     'TagContract',
     'TagCreateUpdateParameters',
     'TagDescriptionContract',
@@ -763,8 +776,12 @@
     'SkuType',
     'ResourceSkuCapacityScaleType',
     'HostnameType',
+    'CertificateSource',
+    'CertificateStatus',
+    'PublicNetworkAccess',
     'VirtualNetworkType',
     'ApimIdentityType',
+    'CreatedByType',
     'NameAvailabilityReason',
     'ProvisioningState',
     'KeyType',

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

@@ -14,10 +14,10 @@
 
 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.
+    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):
@@ -36,6 +36,8 @@ class Protocol(str, Enum):
 
     http = "http"
     https = "https"
+    ws = "ws"
+    wss = "wss"
 
 
 class ContentFormat(str, Enum):
@@ -50,18 +52,23 @@ class ContentFormat(str, Enum):
     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.
+    graphql_link = "graphql-link"  #: The GraphQL API endpoint hosted on a publicly accessible internet address.
 
 
 class SoapApiType(str, Enum):
 
     soap_to_rest = "http"  #: Imports a SOAP API having a RESTful front end.
-    soap_pass_through = "soap"  #: Imports the Soap API having a SOAP front end.
+    soap_pass_through = "soap"  #: Imports the SOAP API having a SOAP front end.
+    web_socket = "websocket"  #: Imports the API having a Websocket front end.
+    graph_ql = "graphql"  #: Imports the API having a GraphQL front end.
 
 
 class ApiType(str, Enum):
 
     http = "http"
     soap = "soap"
+    websocket = "websocket"
+    graphql = "graphql"
 
 
 class State(str, Enum):
@@ -188,6 +195,27 @@ class HostnameType(str, Enum):
     developer_portal = "DeveloperPortal"
 
 
+class CertificateSource(str, Enum):
+
+    managed = "Managed"
+    key_vault = "KeyVault"
+    custom = "Custom"
+    built_in = "BuiltIn"
+
+
+class CertificateStatus(str, Enum):
+
+    completed = "Completed"
+    failed = "Failed"
+    in_progress = "InProgress"
+
+
+class PublicNetworkAccess(str, Enum):
+
+    enabled = "Enabled"
+    disabled = "Disabled"
+
+
 class VirtualNetworkType(str, Enum):
 
     none = "None"  #: The service is not part of any Virtual Network.
@@ -203,6 +231,14 @@ class ApimIdentityType(str, Enum):
     none = "None"
 
 
+class CreatedByType(str, Enum):
+
+    user = "User"
+    application = "Application"
+    managed_identity = "ManagedIdentity"
+    key = "Key"
+
+
 class NameAvailabilityReason(str, Enum):
 
     valid = "Valid"
@@ -274,10 +310,10 @@ class ConnectivityStatusType(str, Enum):
 
 class PortalRevisionStatus(str, Enum):
 
-    pending = "pending"  #: Portal revision publishing is pending
-    publishing = "publishing"  #: Portal revision is publishing
-    completed = "completed"  #: Portal revision publishing completed
-    failed = "failed"  #: Portal revision publishing failed
+    pending = "pending"  #: Portal's revision has been queued.
+    publishing = "publishing"  #: Portal's revision is being published.
+    completed = "completed"  #: Portal's revision publishing completed.
+    failed = "failed"  #: Portal's revision publishing failed.
 
 
 class SubscriptionState(str, Enum):