From 9a205fcc7402662f3505b546dc84d7b087fa4074 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 9 Mar 2018 11:00:35 -0800
Subject: [PATCH] [AutoPR apimanagement/resource-manager] Fixing entities which
 should be per ApiRevision instead of just ApiId (#2142)

* Generated from 12e01481ce3273120c19d20940cdc70b398781b3

Diagnostics and Tags are per Api Revision

* Generated from 29a04a67037543fc21517b6bcacc1cbc87a460c2

Diagnostics and Tags are per Api Revision
---
 .../models/api_create_or_update_parameter.py  |  4 +-
 .../api_create_or_update_parameter_py3.py     |  4 +-
 .../models/api_management_client_enums.py     |  4 +-
 .../operations/api_export_operations.py       |  7 +-
 .../operations/api_operation_operations.py    |  7 +-
 .../api_operation_policy_operations.py        | 14 ++--
 .../operations/api_policy_operations.py       | 14 ++--
 .../operations/api_schema_operations.py       | 35 ++++++----
 .../operations/operation_operations.py        |  7 +-
 .../operations/tag_description_operations.py  | 35 ++++++----
 .../operations/tag_operations.py              | 70 +++++++++++--------
 11 files changed, 114 insertions(+), 87 deletions(-)

diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter.py
index a30f05928865..d1511797f73b 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter.py
@@ -75,8 +75,8 @@ class ApiCreateOrUpdateParameter(Model):
      ~azure.mgmt.apimanagement.models.ApiCreateOrUpdatePropertiesWsdlSelector
     :param soap_api_type: Type of Api to create.
      * `http` creates a SOAP to REST API
-     * `soap` creates a SOAP pass-through API. Possible values include: 'http',
-     'soap'
+     * `soap` creates a SOAP pass-through API. Possible values include:
+     'SoapToRest', 'SoapPassThrough'
     :type soap_api_type: str or ~azure.mgmt.apimanagement.models.SoapApiType
     """
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter_py3.py
index f90a91698dda..fb445174bdb0 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_create_or_update_parameter_py3.py
@@ -75,8 +75,8 @@ class ApiCreateOrUpdateParameter(Model):
      ~azure.mgmt.apimanagement.models.ApiCreateOrUpdatePropertiesWsdlSelector
     :param soap_api_type: Type of Api to create.
      * `http` creates a SOAP to REST API
-     * `soap` creates a SOAP pass-through API. Possible values include: 'http',
-     'soap'
+     * `soap` creates a SOAP pass-through API. Possible values include:
+     'SoapToRest', 'SoapPassThrough'
     :type soap_api_type: str or ~azure.mgmt.apimanagement.models.SoapApiType
     """
 
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 e10468c64c51..fccd5681cb26 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
@@ -36,8 +36,8 @@ class ContentFormat(str, Enum):
 
 class SoapApiType(str, Enum):
 
-    http = "http"
-    soap = "soap"
+    soap_to_rest = "http"
+    soap_pass_through = "soap"
 
 
 class ApiType(str, Enum):
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 67794c74076c..d6041f4f8b45 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
@@ -47,8 +47,9 @@ def get(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :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
@@ -70,7 +71,7 @@ def get(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py
index 75734701521f..a59fa1394d30 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py
@@ -142,8 +142,9 @@ def get_entity_tag(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -163,7 +164,7 @@ def get_entity_tag(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py
index 13e4a640fc6b..3cb9b3ca0d50 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py
@@ -117,8 +117,9 @@ def get_entity_tag(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -138,7 +139,7 @@ def get_entity_tag(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'policyId': self._serialize.url("self.policy_id", self.policy_id, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
@@ -349,8 +350,9 @@ def delete(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -374,7 +376,7 @@ def delete(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'policyId': self._serialize.url("self.policy_id", self.policy_id, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py
index fe1f76b2ea89..83fdff87d9e0 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py
@@ -46,8 +46,9 @@ def list_by_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -65,7 +66,7 @@ def list_by_api(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -117,8 +118,9 @@ def get_entity_tag(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -135,7 +137,7 @@ def get_entity_tag(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'policyId': self._serialize.url("self.policy_id", self.policy_id, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py
index a9425a7eb3bd..582a4af5dcbc 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py
@@ -44,8 +44,9 @@ def list_by_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -66,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
                     'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
@@ -119,8 +120,9 @@ def get_entity_tag(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param schema_id: Schema identifier within an API. Must be unique in
          the current API Management service instance.
@@ -140,7 +142,7 @@ def get_entity_tag(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'schemaId': self._serialize.url("schema_id", schema_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -183,8 +185,9 @@ def get(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param schema_id: Schema identifier within an API. Must be unique in
          the current API Management service instance.
@@ -205,7 +208,7 @@ def get(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'schemaId': self._serialize.url("schema_id", schema_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -257,8 +260,9 @@ def create_or_update(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param schema_id: Schema identifier within an API. Must be unique in
          the current API Management service instance.
@@ -291,7 +295,7 @@ def create_or_update(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'schemaId': self._serialize.url("schema_id", schema_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -346,8 +350,9 @@ def delete(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param schema_id: Schema identifier within an API. Must be unique in
          the current API Management service instance.
@@ -371,7 +376,7 @@ def delete(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'schemaId': self._serialize.url("schema_id", schema_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py
index db7b27cf74b0..eb4cd4c49f36 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py
@@ -45,8 +45,9 @@ def list_by_tags(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param filter: | Field       | Supported operators    | Supported
          functions                         |
@@ -86,7 +87,7 @@ def internal_paging(next_link=None, raw=False):
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
                     'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py
index f175415d17f5..f1ac22de336f 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py
@@ -46,8 +46,9 @@ def list_by_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param filter: | Field       | Supported operators    | Supported
          functions                         |
@@ -80,7 +81,7 @@ def internal_paging(next_link=None, raw=False):
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
                     'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
@@ -138,8 +139,9 @@ def get_entity_state(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -159,7 +161,7 @@ def get_entity_state(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -202,8 +204,9 @@ def get(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -224,7 +227,7 @@ def get(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -276,8 +279,9 @@ def create_or_update(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -304,7 +308,7 @@ def create_or_update(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -359,8 +363,9 @@ def delete(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -384,7 +389,7 @@ def delete(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py
index 8fe61408652f..8890d3d907f2 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py
@@ -471,8 +471,9 @@ def list_by_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param filter: | Field       | Supported operators    | Supported
          functions                         |
@@ -505,7 +506,7 @@ def internal_paging(next_link=None, raw=False):
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
                     'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
@@ -563,8 +564,9 @@ def get_entity_state_by_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -584,7 +586,7 @@ def get_entity_state_by_api(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -627,8 +629,9 @@ def get_by_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -649,7 +652,7 @@ def get_by_api(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -701,8 +704,9 @@ def assign_to_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -726,7 +730,7 @@ def assign_to_api(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -777,8 +781,9 @@ def detach_from_api(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param tag_id: Tag identifier. Must be unique in the current API
          Management service instance.
@@ -802,7 +807,7 @@ def detach_from_api(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
@@ -843,8 +848,9 @@ def list_by_operation(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -886,7 +892,7 @@ def internal_paging(next_link=None, raw=False):
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
                     'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
                     'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
@@ -945,8 +951,9 @@ def get_entity_state_by_operation(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -969,7 +976,7 @@ def get_entity_state_by_operation(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
@@ -1013,8 +1020,9 @@ def get_by_operation(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -1038,7 +1046,7 @@ def get_by_operation(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
@@ -1091,8 +1099,9 @@ def assign_to_operation(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -1119,7 +1128,7 @@ def assign_to_operation(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
@@ -1171,8 +1180,9 @@ def detach_from_operation(
         :type resource_group_name: str
         :param service_name: The name of the API Management service.
         :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param operation_id: Operation identifier within an API. Must be
          unique in the current API Management service instance.
@@ -1199,7 +1209,7 @@ def detach_from_operation(
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'operationId': self._serialize.url("operation_id", operation_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'tagId': self._serialize.url("tag_id", tag_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')