azure_mgmt_api_management 0.18.1 → 0.19.1

data/lib/2018-06-01-preview/generated/azure_mgmt_api_management/tag.rb

@@ -22,17 +22,23 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     attr_reader :client
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -40,23 +46,29 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Array<TagContract>] operation results.
     #
-    def list_by_service(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      first_page = list_by_service_as_lazy(resource_group_name, service_name, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
+    def list_by_operation(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      first_page = list_by_operation_as_lazy(resource_group_name, service_name, api_id, operation_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
       first_page.get_all_items
     end
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -64,22 +76,28 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_service_with_http_info(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      list_by_operation_async(resource_group_name, service_name, api_id, operation_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -87,12 +105,20 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_service_async(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
+    def list_by_operation_async(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, 'api_id is nil' if api_id.nil?
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !operation_id.nil? && operation_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, "'top' should satisfy the constraint - 'InclusiveMinimum': '1'" if !top.nil? && top < 1
       fail ArgumentError, "'skip' should satisfy the constraint - 'InclusiveMinimum': '0'" if !skip.nil? && skip < 0
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
@@ -105,13 +131,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'subscriptionId' => @client.subscription_id},
           query_params: {'$filter' => filter,'$top' => top,'$skip' => skip,'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -124,10 +150,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         response_content = http_response.body
         unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -150,14 +178,19 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def get_entity_state(resource_group_name, service_name, tag_id, custom_headers:nil)
-      response = get_entity_state_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
+    def get_entity_state_by_operation(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      response = get_entity_state_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
       nil
     end
 
@@ -166,6 +199,11 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -173,8 +211,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_entity_state_with_http_info(resource_group_name, service_name, tag_id, custom_headers:nil)
-      get_entity_state_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
+    def get_entity_state_by_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      get_entity_state_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -182,6 +220,11 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -189,16 +232,24 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_entity_state_async(resource_group_name, service_name, tag_id, custom_headers:nil)
+    def get_entity_state_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, 'api_id is nil' if api_id.nil?
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !operation_id.nil? && operation_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -209,13 +260,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -232,6 +283,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -240,10 +293,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Gets the details of the tag specified by its identifier.
+    # Get tag associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -251,16 +309,21 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagContract] operation results.
     #
-    def get(resource_group_name, service_name, tag_id, custom_headers:nil)
-      response = get_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
+    def get_by_operation(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      response = get_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Gets the details of the tag specified by its identifier.
+    # Get tag associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -268,15 +331,20 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_with_http_info(resource_group_name, service_name, tag_id, custom_headers:nil)
-      get_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
+    def get_by_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      get_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
-    # Gets the details of the tag specified by its identifier.
+    # Get tag associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -284,16 +352,24 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_async(resource_group_name, service_name, tag_id, custom_headers:nil)
+    def get_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, 'api_id is nil' if api_id.nil?
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !operation_id.nil? && operation_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -304,13 +380,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -327,6 +403,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -345,64 +423,83 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Creates a tag.
+    # Assign tag to the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param parameters [TagCreateUpdateParameters] Create parameters.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [TagContract] operation results.
     #
-    def create_or_update(resource_group_name, service_name, tag_id, parameters, custom_headers:nil)
-      response = create_or_update_async(resource_group_name, service_name, tag_id, parameters, custom_headers:custom_headers).value!
+    def assign_to_operation(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      response = assign_to_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Creates a tag.
+    # Assign tag to the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param parameters [TagCreateUpdateParameters] Create parameters.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def create_or_update_with_http_info(resource_group_name, service_name, tag_id, parameters, custom_headers:nil)
-      create_or_update_async(resource_group_name, service_name, tag_id, parameters, custom_headers:custom_headers).value!
+    def assign_to_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      assign_to_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
-    # Creates a tag.
+    # Assign tag to the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param parameters [TagCreateUpdateParameters] Create parameters.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def create_or_update_async(resource_group_name, service_name, tag_id, parameters, custom_headers:nil)
+    def assign_to_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, 'api_id is nil' if api_id.nil?
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !operation_id.nil? && operation_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
-      fail ArgumentError, 'parameters is nil' if parameters.nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -413,21 +510,14 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-
-      # Serialize Request
-      request_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagCreateUpdateParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters)
-      request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
-
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
-          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
@@ -443,6 +533,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 201
           begin
@@ -471,73 +563,82 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Updates the details of the tag specified by its identifier.
+    # Detach the tag from the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param parameters [TagCreateUpdateParameters] Update parameters.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def update(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:nil)
-      response = update_async(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:custom_headers).value!
+    def detach_from_operation(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      response = detach_from_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
       nil
     end
 
     #
-    # Updates the details of the tag specified by its identifier.
+    # Detach the tag from the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param parameters [TagCreateUpdateParameters] Update parameters.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def update_with_http_info(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:nil)
-      update_async(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:custom_headers).value!
+    def detach_from_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+      detach_from_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
-    # Updates the details of the tag specified by its identifier.
+    # Detach the tag from the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param parameters [TagCreateUpdateParameters] Update parameters.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def update_async(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:nil)
+    def detach_from_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, 'api_id is nil' if api_id.nil?
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
+      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
+      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !operation_id.nil? && operation_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
-      fail ArgumentError, 'parameters is nil' if parameters.nil?
-      fail ArgumentError, 'if_match is nil' if if_match.nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -547,38 +648,32 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-
-      # Serialize Request
-      request_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagCreateUpdateParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters)
-      request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
-
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
-          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:patch, path_template, options)
+      promise = @client.make_request_async(:delete, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 204
+        unless status_code == 200 || status_code == 204
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -587,112 +682,35 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Deletes specific tag of the API Management service instance.
+    # Lists all Tags associated with the API.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param tag_id [String] Tag identifier. Must be unique in the current API
-    # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
+    # @param api_id [String] 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.
+    # @param filter [String] | Field       | Supported operators    | Supported
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
+    # @param top [Integer] Number of records to return.
+    # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
+    # @return [Array<TagContract>] operation results.
     #
-    def delete(resource_group_name, service_name, tag_id, if_match, custom_headers:nil)
-      response = delete_async(resource_group_name, service_name, tag_id, if_match, custom_headers:custom_headers).value!
-      nil
+    def list_by_api(resource_group_name, service_name, api_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      first_page = list_by_api_as_lazy(resource_group_name, service_name, api_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
+      first_page.get_all_items
     end
 
     #
-    # Deletes specific tag of the API Management service instance.
-    #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param service_name [String] The name of the API Management service.
-    # @param tag_id [String] Tag identifier. Must be unique in the current API
-    # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
-    # @param custom_headers [Hash{String => String}] A hash of custom headers that
-    # will be added to the HTTP request.
-    #
-    # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
-    #
-    def delete_with_http_info(resource_group_name, service_name, tag_id, if_match, custom_headers:nil)
-      delete_async(resource_group_name, service_name, tag_id, if_match, custom_headers:custom_headers).value!
-    end
-
-    #
-    # Deletes specific tag of the API Management service instance.
-    #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param service_name [String] The name of the API Management service.
-    # @param tag_id [String] Tag identifier. Must be unique in the current API
-    # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
-    # @param [Hash{String => String}] A hash of custom headers that will be added
-    # to the HTTP request.
-    #
-    # @return [Concurrent::Promise] Promise object which holds the HTTP response.
-    #
-    def delete_async(resource_group_name, service_name, tag_id, if_match, custom_headers:nil)
-      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
-      fail ArgumentError, 'service_name is nil' if service_name.nil?
-      fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
-      fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
-      fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'tag_id is nil' if tag_id.nil?
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
-      fail ArgumentError, 'if_match is nil' if if_match.nil?
-      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
-      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-
-
-      request_headers = {}
-      request_headers['Content-Type'] = 'application/json; charset=utf-8'
-
-      # Set Headers
-      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['If-Match'] = if_match unless if_match.nil?
-      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
-
-      request_url = @base_url || @client.base_url
-
-      options = {
-          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
-          query_params: {'api-version' => @client.api_version},
-          headers: request_headers.merge(custom_headers || {}),
-          base_url: request_url
-      }
-      promise = @client.make_request_async(:delete, path_template, options)
-
-      promise = promise.then do |result|
-        http_response = result.response
-        status_code = http_response.status
-        response_content = http_response.body
-        unless status_code == 200 || status_code == 204
-          error_model = JSON.load(response_content)
-          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
-        end
-
-        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
-
-        result
-      end
-
-      promise.execute
-    end
-
-    #
-    # Lists all Tags associated with the API.
+    # Lists all Tags associated with the API.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -700,39 +718,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # API Management service instance. Non-current revision has ;rev=n as a suffix
     # where n is the revision number.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # @param top [Integer] Number of records to return.
-    # @param skip [Integer] Number of records to skip.
-    # @param custom_headers [Hash{String => String}] A hash of custom headers that
-    # will be added to the HTTP request.
-    #
-    # @return [Array<TagContract>] operation results.
-    #
-    def list_by_api(resource_group_name, service_name, api_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      first_page = list_by_api_as_lazy(resource_group_name, service_name, api_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
-      first_page.get_all_items
-    end
-
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
     #
-    # Lists all Tags associated with the API.
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -753,12 +745,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # API Management service instance. Non-current revision has ;rev=n as a suffix
     # where n is the revision number.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -811,6 +804,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -894,7 +889,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -928,6 +923,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -1002,7 +999,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1036,6 +1033,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1063,15 +1062,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # where n is the revision number.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [TagContract] operation results.
     #
-    def assign_to_api(resource_group_name, service_name, api_id, tag_id, if_match:nil, custom_headers:nil)
-      response = assign_to_api_async(resource_group_name, service_name, api_id, tag_id, if_match:if_match, custom_headers:custom_headers).value!
+    def assign_to_api(resource_group_name, service_name, api_id, tag_id, custom_headers:nil)
+      response = assign_to_api_async(resource_group_name, service_name, api_id, tag_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -1085,15 +1082,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # where n is the revision number.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def assign_to_api_with_http_info(resource_group_name, service_name, api_id, tag_id, if_match:nil, custom_headers:nil)
-      assign_to_api_async(resource_group_name, service_name, api_id, tag_id, if_match:if_match, custom_headers:custom_headers).value!
+    def assign_to_api_with_http_info(resource_group_name, service_name, api_id, tag_id, custom_headers:nil)
+      assign_to_api_async(resource_group_name, service_name, api_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -1106,14 +1101,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # where n is the revision number.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def assign_to_api_async(resource_group_name, service_name, api_id, tag_id, if_match:nil, custom_headers:nil)
+    def assign_to_api_async(resource_group_name, service_name, api_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
@@ -1126,7 +1119,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1136,7 +1129,6 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
       path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}'
 
@@ -1161,6 +1153,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 201
           begin
@@ -1198,15 +1192,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # where n is the revision number.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def detach_from_api(resource_group_name, service_name, api_id, tag_id, if_match, custom_headers:nil)
-      response = detach_from_api_async(resource_group_name, service_name, api_id, tag_id, if_match, custom_headers:custom_headers).value!
+    def detach_from_api(resource_group_name, service_name, api_id, tag_id, custom_headers:nil)
+      response = detach_from_api_async(resource_group_name, service_name, api_id, tag_id, custom_headers:custom_headers).value!
       nil
     end
 
@@ -1220,16 +1211,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # where n is the revision number.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def detach_from_api_with_http_info(resource_group_name, service_name, api_id, tag_id, if_match, custom_headers:nil)
-      detach_from_api_async(resource_group_name, service_name, api_id, tag_id, if_match, custom_headers:custom_headers).value!
+    def detach_from_api_with_http_info(resource_group_name, service_name, api_id, tag_id, custom_headers:nil)
+      detach_from_api_async(resource_group_name, service_name, api_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -1242,15 +1230,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # where n is the revision number.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def detach_from_api_async(resource_group_name, service_name, api_id, tag_id, if_match, custom_headers:nil)
+    def detach_from_api_async(resource_group_name, service_name, api_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
@@ -1263,8 +1248,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
-      fail ArgumentError, 'if_match is nil' if if_match.nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1274,7 +1258,6 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
       path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}'
 
@@ -1299,6 +1282,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -1307,28 +1292,20 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | method     | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | description | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | urlTemplate | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1336,34 +1313,26 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Array<TagContract>] operation results.
     #
-    def list_by_operation(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      first_page = list_by_operation_as_lazy(resource_group_name, service_name, api_id, operation_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
+    def list_by_product(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      first_page = list_by_product_as_lazy(resource_group_name, service_name, product_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
       first_page.get_all_items
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | method     | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | description | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | urlTemplate | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1371,33 +1340,25 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      list_by_operation_async(resource_group_name, service_name, api_id, operation_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_product_with_http_info(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      list_by_product_async(resource_group_name, service_name, product_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | method     | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | description | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | urlTemplate | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -1405,20 +1366,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_operation_async(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+    def list_by_product_async(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'api_id is nil' if api_id.nil?
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
-      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !operation_id.nil? && operation_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'product_id is nil' if product_id.nil?
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '256'" if !product_id.nil? && product_id.length > 256
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !product_id.nil? && product_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, "'top' should satisfy the constraint - 'InclusiveMinimum': '1'" if !top.nil? && top < 1
       fail ArgumentError, "'skip' should satisfy the constraint - 'InclusiveMinimum': '0'" if !skip.nil? && skip < 0
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
@@ -1431,13 +1388,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'subscriptionId' => @client.subscription_id},
           query_params: {'$filter' => filter,'$top' => top,'$skip' => skip,'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -1454,6 +1411,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1476,19 +1435,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def get_entity_state_by_operation(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
-      response = get_entity_state_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
+    def get_entity_state_by_product(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      response = get_entity_state_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
       nil
     end
 
@@ -1497,11 +1453,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1509,8 +1462,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_entity_state_by_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
-      get_entity_state_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
+    def get_entity_state_by_product_with_http_info(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      get_entity_state_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -1518,11 +1471,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -1530,24 +1480,20 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_entity_state_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+    def get_entity_state_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'api_id is nil' if api_id.nil?
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
-      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !operation_id.nil? && operation_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'product_id is nil' if product_id.nil?
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '256'" if !product_id.nil? && product_id.length > 256
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !product_id.nil? && product_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1558,13 +1504,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -1581,6 +1527,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -1589,15 +1537,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Get tag associated with the Operation.
+    # Get tag associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1605,21 +1550,18 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagContract] operation results.
     #
-    def get_by_operation(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
-      response = get_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
+    def get_by_product(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      response = get_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Get tag associated with the Operation.
+    # Get tag associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1627,20 +1569,17 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_by_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
-      get_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:custom_headers).value!
+    def get_by_product_with_http_info(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      get_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
-    # Get tag associated with the Operation.
+    # Get tag associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -1648,24 +1587,20 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_by_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, custom_headers:nil)
+    def get_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'api_id is nil' if api_id.nil?
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
-      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !operation_id.nil? && operation_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'product_id is nil' if product_id.nil?
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '256'" if !product_id.nil? && product_id.length > 256
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !product_id.nil? && product_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1676,13 +1611,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -1699,6 +1634,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1717,89 +1654,70 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Assign tag to the Operation.
+    # Assign tag to the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [TagContract] operation results.
     #
-    def assign_to_operation(resource_group_name, service_name, api_id, operation_id, tag_id, if_match:nil, custom_headers:nil)
-      response = assign_to_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, if_match:if_match, custom_headers:custom_headers).value!
+    def assign_to_product(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      response = assign_to_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Assign tag to the Operation.
+    # Assign tag to the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def assign_to_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, if_match:nil, custom_headers:nil)
-      assign_to_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, if_match:if_match, custom_headers:custom_headers).value!
+    def assign_to_product_with_http_info(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      assign_to_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
-    # Assign tag to the Operation.
+    # Assign tag to the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def assign_to_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, if_match:nil, custom_headers:nil)
+    def assign_to_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'api_id is nil' if api_id.nil?
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
-      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !operation_id.nil? && operation_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'product_id is nil' if product_id.nil?
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '256'" if !product_id.nil? && product_id.length > 256
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !product_id.nil? && product_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1809,15 +1727,14 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -1834,6 +1751,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 201
           begin
@@ -1862,92 +1781,69 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Detach the tag from the Operation.
+    # Detach the tag from the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def detach_from_operation(resource_group_name, service_name, api_id, operation_id, tag_id, if_match, custom_headers:nil)
-      response = detach_from_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, if_match, custom_headers:custom_headers).value!
+    def detach_from_product(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      response = detach_from_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
       nil
     end
 
     #
-    # Detach the tag from the Operation.
+    # Detach the tag from the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def detach_from_operation_with_http_info(resource_group_name, service_name, api_id, operation_id, tag_id, if_match, custom_headers:nil)
-      detach_from_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, if_match, custom_headers:custom_headers).value!
+    def detach_from_product_with_http_info(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+      detach_from_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
     end
 
     #
-    # Detach the tag from the Operation.
+    # Detach the tag from the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. ETag should match the current
-    # entity state from the header response of the GET request or it should be *
-    # for unconditional update.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def detach_from_operation_async(resource_group_name, service_name, api_id, operation_id, tag_id, if_match, custom_headers:nil)
+    def detach_from_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'api_id is nil' if api_id.nil?
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MaxLength': '256'" if !api_id.nil? && api_id.length > 256
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'MinLength': '1'" if !api_id.nil? && api_id.length < 1
-      fail ArgumentError, "'api_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !api_id.nil? && api_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
-      fail ArgumentError, 'operation_id is nil' if operation_id.nil?
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MaxLength': '80'" if !operation_id.nil? && operation_id.length > 80
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'MinLength': '1'" if !operation_id.nil? && operation_id.length < 1
-      fail ArgumentError, "'operation_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !operation_id.nil? && operation_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'product_id is nil' if product_id.nil?
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '256'" if !product_id.nil? && product_id.length > 256
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
+      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !product_id.nil? && product_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
-      fail ArgumentError, 'if_match is nil' if if_match.nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1957,15 +1853,14 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'apiId' => api_id,'operationId' => operation_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -1982,6 +1877,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -1990,87 +1887,83 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param scope [String] Scope like 'apis', 'products' or 'apis/{apiId}
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [Array<TagContract>] operation results.
     #
-    def list_by_product(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      first_page = list_by_product_as_lazy(resource_group_name, service_name, product_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
+    def list_by_service(resource_group_name, service_name, filter:nil, top:nil, skip:nil, scope:nil, custom_headers:nil)
+      first_page = list_by_service_as_lazy(resource_group_name, service_name, filter:filter, top:top, skip:skip, scope:scope, custom_headers:custom_headers)
       first_page.get_all_items
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param scope [String] Scope like 'apis', 'products' or 'apis/{apiId}
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_product_with_http_info(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      list_by_product_async(resource_group_name, service_name, product_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_service_with_http_info(resource_group_name, service_name, filter:nil, top:nil, skip:nil, scope:nil, custom_headers:nil)
+      list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, scope:scope, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param scope [String] Scope like 'apis', 'products' or 'apis/{apiId}
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_product_async(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+    def list_by_service_async(resource_group_name, service_name, filter:nil, top:nil, skip:nil, scope:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'product_id is nil' if product_id.nil?
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '80'" if !product_id.nil? && product_id.length > 80
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !product_id.nil? && product_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
       fail ArgumentError, "'top' should satisfy the constraint - 'InclusiveMinimum': '1'" if !top.nil? && top < 1
       fail ArgumentError, "'skip' should satisfy the constraint - 'InclusiveMinimum': '0'" if !skip.nil? && skip < 0
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
@@ -2083,14 +1976,14 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'subscriptionId' => @client.subscription_id},
-          query_params: {'$filter' => filter,'$top' => top,'$skip' => skip,'api-version' => @client.api_version},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'$filter' => filter,'$top' => top,'$skip' => skip,'scope' => scope,'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
@@ -2106,6 +1999,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -2128,16 +2023,14 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def get_entity_state_by_product(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
-      response = get_entity_state_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
+    def get_entity_state(resource_group_name, service_name, tag_id, custom_headers:nil)
+      response = get_entity_state_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
       nil
     end
 
@@ -2146,8 +2039,6 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -2155,8 +2046,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_entity_state_by_product_with_http_info(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
-      get_entity_state_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
+    def get_entity_state_with_http_info(resource_group_name, service_name, tag_id, custom_headers:nil)
+      get_entity_state_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -2164,8 +2055,6 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -2173,20 +2062,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_entity_state_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+    def get_entity_state_async(resource_group_name, service_name, tag_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'product_id is nil' if product_id.nil?
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '80'" if !product_id.nil? && product_id.length > 80
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !product_id.nil? && product_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -2197,13 +2082,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -2220,6 +2105,115 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+
+        result
+      end
+
+      promise.execute
+    end
+
+    #
+    # Gets the details of the tag specified by its identifier.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param service_name [String] The name of the API Management service.
+    # @param tag_id [String] Tag identifier. Must be unique in the current API
+    # Management service instance.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [TagContract] operation results.
+    #
+    def get(resource_group_name, service_name, tag_id, custom_headers:nil)
+      response = get_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
+      response.body unless response.nil?
+    end
+
+    #
+    # Gets the details of the tag specified by its identifier.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param service_name [String] The name of the API Management service.
+    # @param tag_id [String] Tag identifier. Must be unique in the current API
+    # Management service instance.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
+    #
+    def get_with_http_info(resource_group_name, service_name, tag_id, custom_headers:nil)
+      get_async(resource_group_name, service_name, tag_id, custom_headers:custom_headers).value!
+    end
+
+    #
+    # Gets the details of the tag specified by its identifier.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param service_name [String] The name of the API Management service.
+    # @param tag_id [String] Tag identifier. Must be unique in the current API
+    # Management service instance.
+    # @param [Hash{String => String}] A hash of custom headers that will be added
+    # to the HTTP request.
+    #
+    # @return [Concurrent::Promise] Promise object which holds the HTTP response.
+    #
+    def get_async(resource_group_name, service_name, tag_id, custom_headers:nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'service_name is nil' if service_name.nil?
+      fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
+      fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
+      fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, 'tag_id is nil' if tag_id.nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
+      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+
+
+      request_headers = {}
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {}),
+          base_url: request_url
+      }
+      promise = @client.make_request_async(:get, path_template, options)
+
+      promise = promise.then do |result|
+        http_response = result.response
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 200
+          error_model = JSON.load(response_content)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
+        end
+
+        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagContract.mapper()
+            result.body = @client.deserialize(result_mapper, parsed_response)
+          rescue Exception => e
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
+          end
+        end
 
         result
       end
@@ -2228,70 +2222,70 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Get tag associated with the Product.
+    # Creates a tag.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
+    # @param parameters [TagCreateUpdateParameters] Create parameters.
+    # @param if_match [String] ETag of the Entity. Not required when creating an
+    # entity, but required when updating an entity.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [TagContract] operation results.
     #
-    def get_by_product(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
-      response = get_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
+    def create_or_update(resource_group_name, service_name, tag_id, parameters, if_match:nil, custom_headers:nil)
+      response = create_or_update_async(resource_group_name, service_name, tag_id, parameters, if_match:if_match, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Get tag associated with the Product.
+    # Creates a tag.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
+    # @param parameters [TagCreateUpdateParameters] Create parameters.
+    # @param if_match [String] ETag of the Entity. Not required when creating an
+    # entity, but required when updating an entity.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_by_product_with_http_info(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
-      get_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:custom_headers).value!
+    def create_or_update_with_http_info(resource_group_name, service_name, tag_id, parameters, if_match:nil, custom_headers:nil)
+      create_or_update_async(resource_group_name, service_name, tag_id, parameters, if_match:if_match, custom_headers:custom_headers).value!
     end
 
     #
-    # Get tag associated with the Product.
+    # Creates a tag.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
+    # @param parameters [TagCreateUpdateParameters] Create parameters.
+    # @param if_match [String] ETag of the Entity. Not required when creating an
+    # entity, but required when updating an entity.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_by_product_async(resource_group_name, service_name, product_id, tag_id, custom_headers:nil)
+    def create_or_update_async(resource_group_name, service_name, tag_id, parameters, if_match:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'product_id is nil' if product_id.nil?
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '80'" if !product_id.nil? && product_id.length > 80
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !product_id.nil? && product_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -2301,30 +2295,50 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
+
+      # Serialize Request
+      request_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagCreateUpdateParameters.mapper()
+      request_content = @client.serialize(request_mapper,  parameters)
+      request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
+
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
+          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:get, path_template, options)
+      promise = @client.make_request_async(:put, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 200
+        unless status_code == 201 || status_code == 200
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+        # Deserialize Response
+        if status_code == 201
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagContract.mapper()
+            result.body = @client.deserialize(result_mapper, parsed_response)
+          rescue Exception => e
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
+          end
+        end
         # Deserialize Response
         if status_code == 200
           begin
@@ -2343,76 +2357,73 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Assign tag to the Product.
+    # Updates the details of the tag specified by its identifier.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
+    # @param parameters [TagCreateUpdateParameters] Update parameters.
+    # @param if_match [String] ETag of the Entity. ETag should match the current
+    # entity state from the header response of the GET request or it should be *
+    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [TagContract] operation results.
     #
-    def assign_to_product(resource_group_name, service_name, product_id, tag_id, if_match:nil, custom_headers:nil)
-      response = assign_to_product_async(resource_group_name, service_name, product_id, tag_id, if_match:if_match, custom_headers:custom_headers).value!
-      response.body unless response.nil?
+    def update(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:nil)
+      response = update_async(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:custom_headers).value!
+      nil
     end
 
     #
-    # Assign tag to the Product.
+    # Updates the details of the tag specified by its identifier.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
+    # @param parameters [TagCreateUpdateParameters] Update parameters.
+    # @param if_match [String] ETag of the Entity. ETag should match the current
+    # entity state from the header response of the GET request or it should be *
+    # for unconditional update.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def assign_to_product_with_http_info(resource_group_name, service_name, product_id, tag_id, if_match:nil, custom_headers:nil)
-      assign_to_product_async(resource_group_name, service_name, product_id, tag_id, if_match:if_match, custom_headers:custom_headers).value!
+    def update_with_http_info(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:nil)
+      update_async(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:custom_headers).value!
     end
 
     #
-    # Assign tag to the Product.
+    # Updates the details of the tag specified by its identifier.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
-    # @param if_match [String] ETag of the Entity. Not required when creating an
-    # entity, but required when updating an entity.
+    # @param parameters [TagCreateUpdateParameters] Update parameters.
+    # @param if_match [String] ETag of the Entity. ETag should match the current
+    # entity state from the header response of the GET request or it should be *
+    # for unconditional update.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def assign_to_product_async(resource_group_name, service_name, product_id, tag_id, if_match:nil, custom_headers:nil)
+    def update_async(resource_group_name, service_name, tag_id, parameters, if_match, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'product_id is nil' if product_id.nil?
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '80'" if !product_id.nil? && product_id.length > 80
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !product_id.nil? && product_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
+      fail ArgumentError, 'if_match is nil' if if_match.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -2424,49 +2435,38 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
+
+      # Serialize Request
+      request_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagCreateUpdateParameters.mapper()
+      request_content = @client.serialize(request_mapper,  parameters)
+      request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
+
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
+          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:put, path_template, options)
+      promise = @client.make_request_async(:patch, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 201 || status_code == 200
+        unless status_code == 204
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
-        # Deserialize Response
-        if status_code == 201
-          begin
-            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagContract.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response)
-          rescue Exception => e
-            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
-          end
-        end
-        # Deserialize Response
-        if status_code == 200
-          begin
-            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::ApiManagement::Mgmt::V2018_06_01_preview::Models::TagContract.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response)
-          rescue Exception => e
-            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
-          end
-        end
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -2475,12 +2475,10 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Detach the tag from the Product.
+    # Deletes specific tag of the API Management service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param if_match [String] ETag of the Entity. ETag should match the current
@@ -2490,18 +2488,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # will be added to the HTTP request.
     #
     #
-    def detach_from_product(resource_group_name, service_name, product_id, tag_id, if_match, custom_headers:nil)
-      response = detach_from_product_async(resource_group_name, service_name, product_id, tag_id, if_match, custom_headers:custom_headers).value!
+    def delete(resource_group_name, service_name, tag_id, if_match, custom_headers:nil)
+      response = delete_async(resource_group_name, service_name, tag_id, if_match, custom_headers:custom_headers).value!
       nil
     end
 
     #
-    # Detach the tag from the Product.
+    # Deletes specific tag of the API Management service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param if_match [String] ETag of the Entity. ETag should match the current
@@ -2512,17 +2508,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def detach_from_product_with_http_info(resource_group_name, service_name, product_id, tag_id, if_match, custom_headers:nil)
-      detach_from_product_async(resource_group_name, service_name, product_id, tag_id, if_match, custom_headers:custom_headers).value!
+    def delete_with_http_info(resource_group_name, service_name, tag_id, if_match, custom_headers:nil)
+      delete_async(resource_group_name, service_name, tag_id, if_match, custom_headers:custom_headers).value!
     end
 
     #
-    # Detach the tag from the Product.
+    # Deletes specific tag of the API Management service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param tag_id [String] Tag identifier. Must be unique in the current API
     # Management service instance.
     # @param if_match [String] ETag of the Entity. ETag should match the current
@@ -2533,20 +2527,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def detach_from_product_async(resource_group_name, service_name, product_id, tag_id, if_match, custom_headers:nil)
+    def delete_async(resource_group_name, service_name, tag_id, if_match, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'product_id is nil' if product_id.nil?
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MaxLength': '80'" if !product_id.nil? && product_id.length > 80
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'MinLength': '1'" if !product_id.nil? && product_id.length < 1
-      fail ArgumentError, "'product_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !product_id.nil? && product_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
       fail ArgumentError, 'tag_id is nil' if tag_id.nil?
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MaxLength': '80'" if !tag_id.nil? && tag_id.length > 80
       fail ArgumentError, "'tag_id' should satisfy the constraint - 'MinLength': '1'" if !tag_id.nil? && tag_id.length < 1
-      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !tag_id.nil? && tag_id.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, "'tag_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !tag_id.nil? && tag_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'if_match is nil' if if_match.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
@@ -2559,13 +2549,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'productId' => product_id,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'tagId' => tag_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -2582,6 +2572,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -2590,7 +2582,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2599,13 +2591,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagCollection] operation results.
     #
-    def list_by_service_next(next_page_link, custom_headers:nil)
-      response = list_by_service_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_operation_next(next_page_link, custom_headers:nil)
+      response = list_by_operation_next_async(next_page_link, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2614,12 +2606,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_service_next_with_http_info(next_page_link, custom_headers:nil)
-      list_by_service_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_operation_next_with_http_info(next_page_link, custom_headers:nil)
+      list_by_operation_next_async(next_page_link, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2628,7 +2620,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_service_next_async(next_page_link, custom_headers:nil)
+    def list_by_operation_next_async(next_page_link, custom_headers:nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -2656,10 +2648,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         response_content = http_response.body
         unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -2748,6 +2742,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -2766,7 +2762,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2775,13 +2771,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagCollection] operation results.
     #
-    def list_by_operation_next(next_page_link, custom_headers:nil)
-      response = list_by_operation_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_product_next(next_page_link, custom_headers:nil)
+      response = list_by_product_next_async(next_page_link, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2790,12 +2786,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_operation_next_with_http_info(next_page_link, custom_headers:nil)
-      list_by_operation_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_product_next_with_http_info(next_page_link, custom_headers:nil)
+      list_by_product_next_async(next_page_link, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2804,7 +2800,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_operation_next_async(next_page_link, custom_headers:nil)
+    def list_by_product_next_async(next_page_link, custom_headers:nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -2836,6 +2832,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -2854,7 +2852,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2863,13 +2861,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagCollection] operation results.
     #
-    def list_by_product_next(next_page_link, custom_headers:nil)
-      response = list_by_product_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_service_next(next_page_link, custom_headers:nil)
+      response = list_by_service_next_async(next_page_link, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2878,12 +2876,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_product_next_with_http_info(next_page_link, custom_headers:nil)
-      list_by_product_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_service_next_with_http_info(next_page_link, custom_headers:nil)
+      list_by_service_next_async(next_page_link, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -2892,7 +2890,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_product_next_async(next_page_link, custom_headers:nil)
+    def list_by_service_next_async(next_page_link, custom_headers:nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -2924,6 +2922,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -2942,17 +2942,23 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists a collection of tags defined within a service instance.
+    # Lists all Tags associated with the Operation.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
+    # @param api_id [String] 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.
+    # @param operation_id [String] Operation identifier within an API. Must be
+    # unique in the current API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -2960,12 +2966,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagCollection] which provide lazy access to pages of the response.
     #
-    def list_by_service_as_lazy(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      response = list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_operation_as_lazy(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      response = list_by_operation_async(resource_group_name, service_name, api_id, operation_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_by_service_next_async(next_page_link, custom_headers:custom_headers)
+          list_by_operation_next_async(next_page_link, custom_headers:custom_headers)
         end
         page
       end
@@ -2980,12 +2986,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # API Management service instance. Non-current revision has ;rev=n as a suffix
     # where n is the revision number.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -3005,28 +3012,20 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Lists all Tags associated with the Operation.
+    # Lists all Tags associated with the Product.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param api_id [String] 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.
-    # @param operation_id [String] Operation identifier within an API. Must be
-    # unique in the current API Management service instance.
+    # @param product_id [String] Product identifier. Must be unique in the current
+    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | method     | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | description | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | urlTemplate | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -3034,44 +3033,44 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [TagCollection] which provide lazy access to pages of the response.
     #
-    def list_by_operation_as_lazy(resource_group_name, service_name, api_id, operation_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      response = list_by_operation_async(resource_group_name, service_name, api_id, operation_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_product_as_lazy(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
+      response = list_by_product_async(resource_group_name, service_name, product_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_by_operation_next_async(next_page_link, custom_headers:custom_headers)
+          list_by_product_next_async(next_page_link, custom_headers:custom_headers)
         end
         page
       end
     end
 
     #
-    # Lists all Tags associated with the Product.
+    # Lists a collection of tags defined within a service instance.
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param product_id [String] Product identifier. Must be unique in the current
-    # API Management service instance.
     # @param filter [String] | Field       | Supported operators    | Supported
-    # functions                         |
-    # |-------------|------------------------|---------------------------------------------|
-    # | id          | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
-    # | name        | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-    # endswith |
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param scope [String] Scope like 'apis', 'products' or 'apis/{apiId}
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [TagCollection] which provide lazy access to pages of the response.
     #
-    def list_by_product_as_lazy(resource_group_name, service_name, product_id, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      response = list_by_product_async(resource_group_name, service_name, product_id, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_service_as_lazy(resource_group_name, service_name, filter:nil, top:nil, skip:nil, scope:nil, custom_headers:nil)
+      response = list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, scope:scope, custom_headers:custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_by_product_next_async(next_page_link, custom_headers:custom_headers)
+          list_by_service_next_async(next_page_link, custom_headers:custom_headers)
         end
         page
       end