Update from release/v3

sdk/apimanagement/azure-mgmt-apimanagement/README.md

@@ -2,7 +2,7 @@
 
 This is the Microsoft Azure API Management Client Library.
 This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
-For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
+For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
 
 
 # Usage

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 ContentTypesOperations
+from .operations import ContentItemOperations
 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_types: ContentTypes operations
+    :vartype content_types: azure.mgmt.apimanagement.operations.ContentTypesOperations
+    :ivar content_item: ContentItem operations
+    :vartype content_item: azure.mgmt.apimanagement.operations.ContentItemOperations
     :ivar api_management_operations: ApiManagementOperations operations
     :vartype api_management_operations: azure.mgmt.apimanagement.operations.ApiManagementOperations
     :ivar api_management_service_skus: ApiManagementServiceSkus operations
@@ -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_types = ContentTypesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.content_item = ContentItemOperations(
+            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

@@ -65,6 +65,8 @@
     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 DeployConfigurationParameters
     from ._models_py3 import DiagnosticContract
     from ._models_py3 import EmailTemplateContract
@@ -135,6 +137,7 @@
     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
@@ -236,6 +239,8 @@
     from ._models import CertificateInformation
     from ._models import ClientSecretContract
     from ._models import ConnectivityStatusContract
+    from ._models import ContentItemContract
+    from ._models import ContentTypeContract
     from ._models import DeployConfigurationParameters
     from ._models import DiagnosticContract
     from ._models import EmailTemplateContract
@@ -306,6 +311,7 @@
     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 +366,8 @@
 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 DiagnosticContractPaged
 from ._paged_models import EmailTemplateContractPaged
 from ._paged_models import GatewayContractPaged
@@ -487,6 +495,8 @@
     'CertificateInformation',
     'ClientSecretContract',
     'ConnectivityStatusContract',
+    'ContentItemContract',
+    'ContentTypeContract',
     'DeployConfigurationParameters',
     'DiagnosticContract',
     'EmailTemplateContract',
@@ -557,6 +567,7 @@
     'QuotaCounterContract',
     'QuotaCounterValueContract',
     'QuotaCounterValueContractProperties',
+    'QuotaCounterValueUpdateContract',
     'RecipientEmailCollection',
     'RecipientEmailContract',
     'RecipientsContractProperties',
@@ -620,6 +631,8 @@
     'BackendContractPaged',
     'CacheContractPaged',
     'CertificateContractPaged',
+    'ContentTypeContractPaged',
+    'ContentItemContractPaged',
     'OperationPaged',
     'ResourceSkuResultPaged',
     'ApiManagementServiceResourcePaged',

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

@@ -210,6 +210,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.
 
 

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

@@ -3230,6 +3230,91 @@ def __init__(self, **kwargs):
         self.last_status_change = kwargs.get('last_status_change', None)
 
 
+class ContentItemContract(Resource):
+    """Content type contract details.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource ID.
+    :vartype id: str
+    :ivar name: Resource name.
+    :vartype name: str
+    :ivar type: Resource type for API Management resource.
+    :vartype type: str
+    :param properties: Properties of the content item.
+    :type properties: dict[str, object]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'properties': {'key': 'properties', 'type': '{object}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContentItemContract, self).__init__(**kwargs)
+        self.properties = kwargs.get('properties', None)
+
+
+class ContentTypeContract(Resource):
+    """Content type contract details.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource ID.
+    :vartype id: str
+    :ivar name: Resource name.
+    :vartype name: str
+    :ivar type: Resource type for API Management resource.
+    :vartype type: str
+    :param content_type_contract_id: Content type identifier
+    :type content_type_contract_id: str
+    :param content_type_contract_name: Content type name. Must be 1 to 250
+     characters long.
+    :type content_type_contract_name: str
+    :param description: Content type description.
+    :type description: str
+    :param schema: Content type schema.
+    :type schema: object
+    :param version: Content type version.
+    :type version: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'content_type_contract_id': {'key': 'properties.id', 'type': 'str'},
+        'content_type_contract_name': {'key': 'properties.name', 'type': 'str'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'schema': {'key': 'properties.schema', 'type': 'object'},
+        'version': {'key': 'properties.version', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContentTypeContract, self).__init__(**kwargs)
+        self.content_type_contract_id = kwargs.get('content_type_contract_id', None)
+        self.content_type_contract_name = kwargs.get('content_type_contract_name', None)
+        self.description = kwargs.get('description', None)
+        self.schema = kwargs.get('schema', None)
+        self.version = kwargs.get('version', None)
+
+
 class DeployConfigurationParameters(Model):
     """Deploy Tenant Configuration Contract.
 
@@ -5779,12 +5864,12 @@ class ProductContract(Resource):
      developers to call the product’s APIs immediately after subscribing. If
      true, administrators must manually approve the subscription before the
      developer can any of the product’s APIs. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
      have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type subscriptions_limit: int
     :param state: whether product is published or not. Published products are
      discoverable by users of developer portal. Non published products are
@@ -5849,12 +5934,12 @@ class ProductEntityBaseParameters(Model):
      developers to call the product’s APIs immediately after subscribing. If
      true, administrators must manually approve the subscription before the
      developer can any of the product’s APIs. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
      have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type subscriptions_limit: int
     :param state: whether product is published or not. Published products are
      discoverable by users of developer portal. Non published products are
@@ -5910,12 +5995,12 @@ class ProductTagResourceContractProperties(ProductEntityBaseParameters):
      developers to call the product’s APIs immediately after subscribing. If
      true, administrators must manually approve the subscription before the
      developer can any of the product’s APIs. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
      have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type subscriptions_limit: int
     :param state: whether product is published or not. Published products are
      discoverable by users of developer portal. Non published products are
@@ -5972,12 +6057,12 @@ class ProductUpdateParameters(Model):
      developers to call the product’s APIs immediately after subscribing. If
      true, administrators must manually approve the subscription before the
      developer can any of the product’s APIs. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
      have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
-     subscriptionRequired property is present and has a value of false.
+     subscriptionRequired property is present and has a value of true.
     :type subscriptions_limit: int
     :param state: whether product is published or not. Published products are
      discoverable by users of developer portal. Non published products are
@@ -6142,6 +6227,26 @@ def __init__(self, **kwargs):
         self.kb_transferred = kwargs.get('kb_transferred', None)
 
 
+class QuotaCounterValueUpdateContract(Model):
+    """Quota counter value details.
+
+    :param calls_count: Number of times Counter was called.
+    :type calls_count: int
+    :param kb_transferred: Data Transferred in KiloBytes.
+    :type kb_transferred: float
+    """
+
+    _attribute_map = {
+        'calls_count': {'key': 'properties.callsCount', 'type': 'int'},
+        'kb_transferred': {'key': 'properties.kbTransferred', 'type': 'float'},
+    }
+
+    def __init__(self, **kwargs):
+        super(QuotaCounterValueUpdateContract, self).__init__(**kwargs)
+        self.calls_count = kwargs.get('calls_count', None)
+        self.kb_transferred = kwargs.get('kb_transferred', None)
+
+
 class RecipientEmailCollection(Model):
     """Paged Recipient User list representation.
 
@@ -6976,7 +7081,7 @@ class SubscriptionContract(Resource):
      value.
     :type secondary_key: str
     :param state_comment: Optional subscription comment added by an
-     administrator.
+     administrator when the state is changed to the 'rejected'.
     :type state_comment: str
     :param allow_tracing: Determines whether tracing is enabled
     :type allow_tracing: bool
@@ -7183,7 +7288,7 @@ class SubscriptionUpdateParameters(Model):
      'suspended', 'active', 'expired', 'submitted', 'rejected', 'cancelled'
     :type state: str or ~azure.mgmt.apimanagement.models.SubscriptionState
     :param state_comment: Comments describing subscription state change by the
-     administrator.
+     administrator when the state is changed to the 'rejected'.
     :type state_comment: str
     :param allow_tracing: Determines whether tracing can be enabled
     :type allow_tracing: bool
@@ -7620,7 +7725,7 @@ class UserCreateParameters(Model):
      password is generated.
     :type password: str
     :param app_type: Determines the type of application which send the create
-     user request. Default is old publisher portal. Possible values include:
+     user request. Default is legacy portal. Possible values include: 'portal',
      'developerPortal'
     :type app_type: str or ~azure.mgmt.apimanagement.models.AppType
     :param confirmation: Determines the type of confirmation e-mail that will