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

[Cognitive Services] RP version 2021-04-30 (Azure#14222)

* Base Change

* checkin samples and readme

* Swagger Change

* fix pretty

* adress lint issues

* fix prettier

* Add deletedAccount, few other fixes

* Change apiProperties to raw dictionary.

* remove unnecessary files

* mark PrivateEndpointConnections as readonly in AccountProperties

* Add "x-ms-long-running-operation"

* bring ApiProperties back

* fix a mistake in URL

* fix: mark endpoints as read-only

* fix build errors

* Adjust swagger for issues found in generated SDK.

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

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

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

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "4f41eaf363c353376220750c65c947c096e0abd8",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/cognitiveservices/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/cognitiveservices/resource-manager/readme.md"
+}

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/_cognitive_services_management_client.py

@@ -15,6 +15,7 @@
 from ._configuration import CognitiveServicesManagementClientConfiguration
 from .operations import CognitiveServicesManagementClientOperationsMixin
 from .operations import AccountsOperations
+from .operations import DeletedAccountsOperations
 from .operations import ResourceSkusOperations
 from .operations import Operations
 from .operations import PrivateEndpointConnectionsOperations
@@ -30,6 +31,8 @@ class CognitiveServicesManagementClient(CognitiveServicesManagementClientOperati
 
     :ivar accounts: Accounts operations
     :vartype accounts: azure.mgmt.cognitiveservices.operations.AccountsOperations
+    :ivar deleted_accounts: DeletedAccounts operations
+    :vartype deleted_accounts: azure.mgmt.cognitiveservices.operations.DeletedAccountsOperations
     :ivar resource_skus: ResourceSkus operations
     :vartype resource_skus: azure.mgmt.cognitiveservices.operations.ResourceSkusOperations
     :ivar operations: Operations operations
@@ -54,12 +57,14 @@ def __init__(
         super(CognitiveServicesManagementClient, 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 = '2017-04-18'
+        self.api_version = '2021-04-30'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
         self.accounts = AccountsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.deleted_accounts = DeletedAccountsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.resource_skus = ResourceSkusOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.operations = Operations(

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

@@ -10,28 +10,28 @@
 # --------------------------------------------------------------------------
 
 try:
+    from ._models_py3 import Account
+    from ._models_py3 import AccountProperties
+    from ._models_py3 import AccountSku
+    from ._models_py3 import AccountSkuListResult
+    from ._models_py3 import ApiKeys
+    from ._models_py3 import ApiProperties
     from ._models_py3 import AzureEntityResource
+    from ._models_py3 import CallRateLimit
     from ._models_py3 import CheckDomainAvailabilityParameter
-    from ._models_py3 import CheckDomainAvailabilityResult
     from ._models_py3 import CheckSkuAvailabilityParameter
-    from ._models_py3 import CheckSkuAvailabilityResult
-    from ._models_py3 import CheckSkuAvailabilityResultList
-    from ._models_py3 import CognitiveServicesAccount
-    from ._models_py3 import CognitiveServicesAccountApiProperties
-    from ._models_py3 import CognitiveServicesAccountEnumerateSkusResult
-    from ._models_py3 import CognitiveServicesAccountKeys
-    from ._models_py3 import CognitiveServicesAccountProperties
-    from ._models_py3 import CognitiveServicesResourceAndSku
+    from ._models_py3 import DomainAvailability
     from ._models_py3 import Encryption
-    from ._models_py3 import Error, ErrorException
-    from ._models_py3 import ErrorBody
+    from ._models_py3 import ErrorAdditionalInfo
+    from ._models_py3 import ErrorDetail
+    from ._models_py3 import ErrorResponse, ErrorResponseException
     from ._models_py3 import Identity
     from ._models_py3 import IpRule
     from ._models_py3 import KeyVaultProperties
     from ._models_py3 import MetricName
     from ._models_py3 import NetworkRuleSet
-    from ._models_py3 import OperationDisplayInfo
-    from ._models_py3 import OperationEntity
+    from ._models_py3 import Operation
+    from ._models_py3 import OperationDisplay
     from ._models_py3 import PrivateEndpoint
     from ._models_py3 import PrivateEndpointConnection
     from ._models_py3 import PrivateEndpointConnectionListResult
@@ -41,42 +41,49 @@
     from ._models_py3 import PrivateLinkResourceProperties
     from ._models_py3 import PrivateLinkServiceConnectionState
     from ._models_py3 import ProxyResource
+    from ._models_py3 import QuotaLimit
     from ._models_py3 import RegenerateKeyParameters
+    from ._models_py3 import RequestMatchPattern
     from ._models_py3 import Resource
     from ._models_py3 import ResourceSku
     from ._models_py3 import ResourceSkuRestrictionInfo
     from ._models_py3 import ResourceSkuRestrictions
     from ._models_py3 import Sku
+    from ._models_py3 import SkuAvailability
+    from ._models_py3 import SkuAvailabilityListResult
     from ._models_py3 import SkuCapability
+    from ._models_py3 import SkuChangeInfo
+    from ._models_py3 import SystemData
+    from ._models_py3 import ThrottlingRule
     from ._models_py3 import TrackedResource
     from ._models_py3 import Usage
-    from ._models_py3 import UsagesResult
+    from ._models_py3 import UsageListResult
     from ._models_py3 import UserAssignedIdentity
     from ._models_py3 import UserOwnedStorage
     from ._models_py3 import VirtualNetworkRule
 except (SyntaxError, ImportError):
+    from ._models import Account
+    from ._models import AccountProperties
+    from ._models import AccountSku
+    from ._models import AccountSkuListResult
+    from ._models import ApiKeys
+    from ._models import ApiProperties
     from ._models import AzureEntityResource
+    from ._models import CallRateLimit
     from ._models import CheckDomainAvailabilityParameter
-    from ._models import CheckDomainAvailabilityResult
     from ._models import CheckSkuAvailabilityParameter
-    from ._models import CheckSkuAvailabilityResult
-    from ._models import CheckSkuAvailabilityResultList
-    from ._models import CognitiveServicesAccount
-    from ._models import CognitiveServicesAccountApiProperties
-    from ._models import CognitiveServicesAccountEnumerateSkusResult
-    from ._models import CognitiveServicesAccountKeys
-    from ._models import CognitiveServicesAccountProperties
-    from ._models import CognitiveServicesResourceAndSku
+    from ._models import DomainAvailability
     from ._models import Encryption
-    from ._models import Error, ErrorException
-    from ._models import ErrorBody
+    from ._models import ErrorAdditionalInfo
+    from ._models import ErrorDetail
+    from ._models import ErrorResponse, ErrorResponseException
     from ._models import Identity
     from ._models import IpRule
     from ._models import KeyVaultProperties
     from ._models import MetricName
     from ._models import NetworkRuleSet
-    from ._models import OperationDisplayInfo
-    from ._models import OperationEntity
+    from ._models import Operation
+    from ._models import OperationDisplay
     from ._models import PrivateEndpoint
     from ._models import PrivateEndpointConnection
     from ._models import PrivateEndpointConnectionListResult
@@ -86,60 +93,71 @@
     from ._models import PrivateLinkResourceProperties
     from ._models import PrivateLinkServiceConnectionState
     from ._models import ProxyResource
+    from ._models import QuotaLimit
     from ._models import RegenerateKeyParameters
+    from ._models import RequestMatchPattern
     from ._models import Resource
     from ._models import ResourceSku
     from ._models import ResourceSkuRestrictionInfo
     from ._models import ResourceSkuRestrictions
     from ._models import Sku
+    from ._models import SkuAvailability
+    from ._models import SkuAvailabilityListResult
     from ._models import SkuCapability
+    from ._models import SkuChangeInfo
+    from ._models import SystemData
+    from ._models import ThrottlingRule
     from ._models import TrackedResource
     from ._models import Usage
-    from ._models import UsagesResult
+    from ._models import UsageListResult
     from ._models import UserAssignedIdentity
     from ._models import UserOwnedStorage
     from ._models import VirtualNetworkRule
-from ._paged_models import CognitiveServicesAccountPaged
-from ._paged_models import OperationEntityPaged
+from ._paged_models import AccountPaged
+from ._paged_models import OperationPaged
 from ._paged_models import ResourceSkuPaged
 from ._cognitive_services_management_client_enums import (
     SkuTier,
+    ResourceIdentityType,
+    CreatedByType,
     ProvisioningState,
     NetworkRuleAction,
     KeySource,
     PrivateEndpointServiceConnectionStatus,
+    PrivateEndpointConnectionProvisioningState,
     PublicNetworkAccess,
-    IdentityType,
     KeyName,
     UnitType,
     QuotaUsageStatus,
     ResourceSkuRestrictionsType,
     ResourceSkuRestrictionsReasonCode,
+    Origin,
+    ActionType,
 )
 
 __all__ = [
+    'Account',
+    'AccountProperties',
+    'AccountSku',
+    'AccountSkuListResult',
+    'ApiKeys',
+    'ApiProperties',
     'AzureEntityResource',
+    'CallRateLimit',
     'CheckDomainAvailabilityParameter',
-    'CheckDomainAvailabilityResult',
     'CheckSkuAvailabilityParameter',
-    'CheckSkuAvailabilityResult',
-    'CheckSkuAvailabilityResultList',
-    'CognitiveServicesAccount',
-    'CognitiveServicesAccountApiProperties',
-    'CognitiveServicesAccountEnumerateSkusResult',
-    'CognitiveServicesAccountKeys',
-    'CognitiveServicesAccountProperties',
-    'CognitiveServicesResourceAndSku',
+    'DomainAvailability',
     'Encryption',
-    'Error', 'ErrorException',
-    'ErrorBody',
+    'ErrorAdditionalInfo',
+    'ErrorDetail',
+    'ErrorResponse', 'ErrorResponseException',
     'Identity',
     'IpRule',
     'KeyVaultProperties',
     'MetricName',
     'NetworkRuleSet',
-    'OperationDisplayInfo',
-    'OperationEntity',
+    'Operation',
+    'OperationDisplay',
     'PrivateEndpoint',
     'PrivateEndpointConnection',
     'PrivateEndpointConnectionListResult',
@@ -149,32 +167,43 @@
     'PrivateLinkResourceProperties',
     'PrivateLinkServiceConnectionState',
     'ProxyResource',
+    'QuotaLimit',
     'RegenerateKeyParameters',
+    'RequestMatchPattern',
     'Resource',
     'ResourceSku',
     'ResourceSkuRestrictionInfo',
     'ResourceSkuRestrictions',
     'Sku',
+    'SkuAvailability',
+    'SkuAvailabilityListResult',
     'SkuCapability',
+    'SkuChangeInfo',
+    'SystemData',
+    'ThrottlingRule',
     'TrackedResource',
     'Usage',
-    'UsagesResult',
+    'UsageListResult',
     'UserAssignedIdentity',
     'UserOwnedStorage',
     'VirtualNetworkRule',
-    'CognitiveServicesAccountPaged',
+    'AccountPaged',
     'ResourceSkuPaged',
-    'OperationEntityPaged',
+    'OperationPaged',
     'SkuTier',
+    'ResourceIdentityType',
+    'CreatedByType',
     'ProvisioningState',
     'NetworkRuleAction',
     'KeySource',
     'PrivateEndpointServiceConnectionStatus',
+    'PrivateEndpointConnectionProvisioningState',
     'PublicNetworkAccess',
-    'IdentityType',
     'KeyName',
     'UnitType',
     'QuotaUsageStatus',
     'ResourceSkuRestrictionsType',
     'ResourceSkuRestrictionsReasonCode',
+    'Origin',
+    'ActionType',
 ]

sdk/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices/models/_cognitive_services_management_client_enums.py

@@ -15,18 +15,37 @@
 class SkuTier(str, Enum):
 
     free = "Free"
+    basic = "Basic"
     standard = "Standard"
     premium = "Premium"
+    enterprise = "Enterprise"
+
+
+class ResourceIdentityType(str, Enum):
+
+    none = "None"
+    system_assigned = "SystemAssigned"
+    user_assigned = "UserAssigned"
+    system_assigned_user_assigned = "SystemAssigned, UserAssigned"
+
+
+class CreatedByType(str, Enum):
+
+    user = "User"
+    application = "Application"
+    managed_identity = "ManagedIdentity"
+    key = "Key"
 
 
 class ProvisioningState(str, Enum):
 
+    accepted = "Accepted"
     creating = "Creating"
-    resolving_dns = "ResolvingDNS"
-    moving = "Moving"
     deleting = "Deleting"
-    succeeded = "Succeeded"
+    moving = "Moving"
     failed = "Failed"
+    succeeded = "Succeeded"
+    resolving_dns = "ResolvingDNS"
 
 
 class NetworkRuleAction(str, Enum):
@@ -46,20 +65,20 @@ class PrivateEndpointServiceConnectionStatus(str, Enum):
     pending = "Pending"
     approved = "Approved"
     rejected = "Rejected"
-    disconnected = "Disconnected"
 
 
-class PublicNetworkAccess(str, Enum):
+class PrivateEndpointConnectionProvisioningState(str, Enum):
 
-    enabled = "Enabled"
-    disabled = "Disabled"
+    succeeded = "Succeeded"
+    creating = "Creating"
+    deleting = "Deleting"
+    failed = "Failed"
 
 
-class IdentityType(str, Enum):
+class PublicNetworkAccess(str, Enum):
 
-    none = "None"
-    system_assigned = "SystemAssigned"
-    user_assigned = "UserAssigned"
+    enabled = "Enabled"
+    disabled = "Disabled"
 
 
 class KeyName(str, Enum):
@@ -97,3 +116,15 @@ class ResourceSkuRestrictionsReasonCode(str, Enum):
 
     quota_id = "QuotaId"
     not_available_for_subscription = "NotAvailableForSubscription"
+
+
+class Origin(str, Enum):
+
+    user = "user"
+    system = "system"
+    usersystem = "user,system"
+
+
+class ActionType(str, Enum):
+
+    internal = "Internal"