azure_mgmt_service_bus 0.10.0 → 0.11.0

data/lib/generated/azure_mgmt_service_bus/models/sql_rule_action.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator 1.2.2.0
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::ARM::ServiceBus
+  module Models
+    #
+    # Represents set of actions written in SQL language-based syntax that is
+    # performed against a ServiceBus.Messaging.BrokeredMessage
+    #
+    class SqlRuleAction < Action
+
+      include MsRestAzure
+
+      include MsRest::JSONable
+
+      #
+      # Mapper for SqlRuleAction class as Ruby Hash.
+      # This will be used for serialization/deserialization.
+      #
+      def self.mapper()
+        {
+          required: false,
+          serialized_name: 'SqlRuleAction',
+          type: {
+            name: 'Composite',
+            class_name: 'SqlRuleAction',
+            model_properties: {
+              sql_expression: {
+                required: false,
+                serialized_name: 'sqlExpression',
+                type: {
+                  name: 'String'
+                }
+              },
+              compatibility_level: {
+                required: false,
+                serialized_name: 'compatibilityLevel',
+                type: {
+                  name: 'Number'
+                }
+              },
+              requires_preprocessing: {
+                required: false,
+                serialized_name: 'requiresPreprocessing',
+                default_value: true,
+                type: {
+                  name: 'Boolean'
+                }
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/generated/azure_mgmt_service_bus/models/tracked_resource.rb

@@ -0,0 +1,86 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator 1.2.2.0
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::ARM::ServiceBus
+  module Models
+    #
+    # The Resource definition.
+    #
+    class TrackedResource < MsRestAzure::Resource
+
+      include MsRestAzure
+
+      include MsRest::JSONable
+      # @return [String] The Geo-location where the resource live
+      attr_accessor :location
+
+      # @return [Hash{String => String}] Resource tags
+      attr_accessor :tags
+
+
+      #
+      # Mapper for TrackedResource class as Ruby Hash.
+      # This will be used for serialization/deserialization.
+      #
+      def self.mapper()
+        {
+          required: false,
+          serialized_name: 'TrackedResource',
+          type: {
+            name: 'Composite',
+            class_name: 'TrackedResource',
+            model_properties: {
+              id: {
+                required: false,
+                read_only: true,
+                serialized_name: 'id',
+                type: {
+                  name: 'String'
+                }
+              },
+              name: {
+                required: false,
+                read_only: true,
+                serialized_name: 'name',
+                type: {
+                  name: 'String'
+                }
+              },
+              type: {
+                required: false,
+                read_only: true,
+                serialized_name: 'type',
+                type: {
+                  name: 'String'
+                }
+              },
+              location: {
+                required: true,
+                serialized_name: 'location',
+                type: {
+                  name: 'String'
+                }
+              },
+              tags: {
+                required: false,
+                serialized_name: 'tags',
+                type: {
+                  name: 'Dictionary',
+                  value: {
+                      required: false,
+                      serialized_name: 'StringElementType',
+                      type: {
+                        name: 'String'
+                      }
+                  }
+                }
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/generated/azure_mgmt_service_bus/models/unavailable_reason.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator 1.2.2.0
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::ARM::ServiceBus
+  module Models
+    #
+    # Defines values for UnavailableReason
+    #
+    module UnavailableReason
+      None = "None"
+      InvalidName = "InvalidName"
+      SubscriptionIsDisabled = "SubscriptionIsDisabled"
+      NameInUse = "NameInUse"
+      NameInLockdown = "NameInLockdown"
+      TooManyNamespaceInCurrentSubscription = "TooManyNamespaceInCurrentSubscription"
+    end
+  end
+end

data/lib/generated/azure_mgmt_service_bus/module_definition.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 1.0.1.0
+# Code generated by Microsoft (R) AutoRest Code Generator 1.2.2.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 

data/lib/generated/azure_mgmt_service_bus/namespaces.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 1.0.1.0
+# Code generated by Microsoft (R) AutoRest Code Generator 1.2.2.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -8,7 +8,6 @@ module Azure::ARM::ServiceBus
   # Azure Service Bus client
   #
   class Namespaces
-    include Azure::ARM::ServiceBus::Models
     include MsRestAzure
 
     #
@@ -22,6 +21,105 @@ module Azure::ARM::ServiceBus
     # @return [ServiceBusManagementClient] reference to the ServiceBusManagementClient
     attr_reader :client
 
+    #
+    # Check the give namespace name availability.
+    #
+    # @param parameters [CheckNameAvailability] Parameters to check availability of
+    # the given namespace name
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [CheckNameAvailabilityResult] operation results.
+    #
+    def check_name_availability_method(parameters, custom_headers = nil)
+      response = check_name_availability_method_async(parameters, custom_headers).value!
+      response.body unless response.nil?
+    end
+
+    #
+    # Check the give namespace name availability.
+    #
+    # @param parameters [CheckNameAvailability] Parameters to check availability of
+    # the given namespace name
+    # @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 check_name_availability_method_with_http_info(parameters, custom_headers = nil)
+      check_name_availability_method_async(parameters, custom_headers).value!
+    end
+
+    #
+    # Check the give namespace name availability.
+    #
+    # @param parameters [CheckNameAvailability] Parameters to check availability of
+    # the given namespace name
+    # @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 check_name_availability_method_async(parameters, custom_headers = 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?
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
+
+
+      request_headers = {}
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Serialize Request
+      request_mapper = Azure::ARM::ServiceBus::Models::CheckNameAvailability.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}/providers/Microsoft.ServiceBus/CheckNameAvailability'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'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(:post, 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?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::ARM::ServiceBus::Models::CheckNameAvailabilityResult.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
+
+      promise.execute
+    end
+
     #
     # Gets all the available namespaces within the subscription, irrespective of
     # the resource groups.
@@ -29,10 +127,10 @@ module Azure::ARM::ServiceBus
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [Array<NamespaceResource>] operation results.
+    # @return [Array<SBNamespace>] operation results.
     #
-    def list_by_subscription(custom_headers = nil)
-      first_page = list_by_subscription_as_lazy(custom_headers)
+    def list(custom_headers = nil)
+      first_page = list_as_lazy(custom_headers)
       first_page.get_all_items
     end
 
@@ -45,8 +143,8 @@ module Azure::ARM::ServiceBus
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_subscription_with_http_info(custom_headers = nil)
-      list_by_subscription_async(custom_headers).value!
+    def list_with_http_info(custom_headers = nil)
+      list_async(custom_headers).value!
     end
 
     #
@@ -58,7 +156,7 @@ module Azure::ARM::ServiceBus
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_subscription_async(custom_headers = nil)
+    def list_async(custom_headers = 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?
 
@@ -68,7 +166,7 @@ module Azure::ARM::ServiceBus
       # 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}/providers/Microsoft.ServiceBus/namespaces'
+      path_template = 'subscriptions/{subscriptionId}/providers/Microsoft.ServiceBus/namespaces'
 
       request_url = @base_url || @client.base_url
 
@@ -87,7 +185,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -95,8 +193,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = NamespaceListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespaceListResult.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
@@ -111,11 +209,12 @@ module Azure::ARM::ServiceBus
     #
     # Gets the available namespaces within a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [Array<NamespaceResource>] operation results.
+    # @return [Array<SBNamespace>] operation results.
     #
     def list_by_resource_group(resource_group_name, custom_headers = nil)
       first_page = list_by_resource_group_as_lazy(resource_group_name, custom_headers)
@@ -125,7 +224,8 @@ module Azure::ARM::ServiceBus
     #
     # Gets the available namespaces within a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -138,7 +238,8 @@ module Azure::ARM::ServiceBus
     #
     # Gets the available namespaces within a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -155,7 +256,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces'
 
       request_url = @base_url || @client.base_url
 
@@ -174,7 +275,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -182,8 +283,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = NamespaceListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespaceListResult.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
@@ -199,14 +300,15 @@ module Azure::ARM::ServiceBus
     # Creates or updates a service namespace. Once created, this namespace's
     # resource manifest is immutable. This operation is idempotent.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param namespace_name [String] The namespace name.
-    # @param parameters [NamespaceCreateOrUpdateParameters] Parameters supplied to
-    # create a namespace resource.
+    # @param parameters [SBNamespace] Parameters supplied to create a namespace
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceResource] operation results.
+    # @return [SBNamespace] operation results.
     #
     def create_or_update(resource_group_name, namespace_name, parameters, custom_headers = nil)
       response = create_or_update_async(resource_group_name, namespace_name, parameters, custom_headers).value!
@@ -214,10 +316,11 @@ module Azure::ARM::ServiceBus
     end
 
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param namespace_name [String] The namespace name.
-    # @param parameters [NamespaceCreateOrUpdateParameters] Parameters supplied to
-    # create a namespace resource.
+    # @param parameters [SBNamespace] Parameters supplied to create a namespace
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -231,8 +334,8 @@ module Azure::ARM::ServiceBus
       promise = promise.then do |response|
         # Defining deserialization method.
         deserialize_method = lambda do |parsed_response|
-          result_mapper = NamespaceResource.mapper()
-          parsed_response = @client.deserialize(result_mapper, parsed_response, 'parsed_response')
+          result_mapper = Azure::ARM::ServiceBus::Models::SBNamespace.mapper()
+          parsed_response = @client.deserialize(result_mapper, parsed_response)
         end
 
         # Waiting for response.
@@ -246,8 +349,9 @@ module Azure::ARM::ServiceBus
     # Deletes an existing namespace. This operation also removes all associated
     # resources under the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -257,8 +361,9 @@ module Azure::ARM::ServiceBus
     end
 
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -284,12 +389,13 @@ module Azure::ARM::ServiceBus
     #
     # Gets a description for the specified namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceResource] operation results.
+    # @return [SBNamespace] operation results.
     #
     def get(resource_group_name, namespace_name, custom_headers = nil)
       response = get_async(resource_group_name, namespace_name, custom_headers).value!
@@ -299,8 +405,9 @@ module Azure::ARM::ServiceBus
     #
     # Gets a description for the specified namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -313,8 +420,9 @@ module Azure::ARM::ServiceBus
     #
     # Gets a description for the specified namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -332,7 +440,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces/{namespaceName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}'
 
       request_url = @base_url || @client.base_url
 
@@ -351,16 +459,139 @@ module Azure::ARM::ServiceBus
         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?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespace.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
+
+      promise.execute
+    end
+
+    #
+    # Updates a service namespace. Once created, this namespace's resource manifest
+    # is immutable. This operation is idempotent.
+    #
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param parameters [SBNamespaceUpdateParameters] Parameters supplied to update
+    # a namespace resource.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [SBNamespace] operation results.
+    #
+    def update(resource_group_name, namespace_name, parameters, custom_headers = nil)
+      response = update_async(resource_group_name, namespace_name, parameters, custom_headers).value!
+      response.body unless response.nil?
+    end
+
+    #
+    # Updates a service namespace. Once created, this namespace's resource manifest
+    # is immutable. This operation is idempotent.
+    #
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param parameters [SBNamespaceUpdateParameters] Parameters supplied to update
+    # a namespace resource.
+    # @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, namespace_name, parameters, custom_headers = nil)
+      update_async(resource_group_name, namespace_name, parameters, custom_headers).value!
+    end
+
+    #
+    # Updates a service namespace. Once created, this namespace's resource manifest
+    # is immutable. This operation is idempotent.
+    #
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param parameters [SBNamespaceUpdateParameters] Parameters supplied to update
+    # a namespace resource.
+    # @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, namespace_name, parameters, custom_headers = nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'namespace_name is nil' if namespace_name.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?
+
+
+      request_headers = {}
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Serialize Request
+      request_mapper = Azure::ARM::ServiceBus::Models::SBNamespaceUpdateParameters.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.ServiceBus/namespaces/{namespaceName}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'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 = 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 || status_code == 202
+          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::ARM::ServiceBus::Models::SBNamespace.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 = NamespaceResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespace.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
@@ -375,12 +606,13 @@ module Azure::ARM::ServiceBus
     #
     # Gets the authorization rules for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [Array<SharedAccessAuthorizationRuleResource>] operation results.
+    # @return [Array<SBAuthorizationRule>] operation results.
     #
     def list_authorization_rules(resource_group_name, namespace_name, custom_headers = nil)
       first_page = list_authorization_rules_as_lazy(resource_group_name, namespace_name, custom_headers)
@@ -390,8 +622,9 @@ module Azure::ARM::ServiceBus
     #
     # Gets the authorization rules for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -404,8 +637,9 @@ module Azure::ARM::ServiceBus
     #
     # Gets the authorization rules for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -423,7 +657,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces/{namespaceName}/AuthorizationRules'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/AuthorizationRules'
 
       request_url = @base_url || @client.base_url
 
@@ -442,7 +676,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -450,8 +684,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = SharedAccessAuthorizationRuleListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBAuthorizationRuleListResult.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
@@ -466,15 +700,15 @@ module Azure::ARM::ServiceBus
     #
     # Creates or updates an authorization rule for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Namespace authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
+    # @param parameters [SBAuthorizationRule] The shared access authorization rule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [SharedAccessAuthorizationRuleResource] operation results.
+    # @return [SBAuthorizationRule] operation results.
     #
     def create_or_update_authorization_rule(resource_group_name, namespace_name, authorization_rule_name, parameters, custom_headers = nil)
       response = create_or_update_authorization_rule_async(resource_group_name, namespace_name, authorization_rule_name, parameters, custom_headers).value!
@@ -484,11 +718,11 @@ module Azure::ARM::ServiceBus
     #
     # Creates or updates an authorization rule for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Namespace authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
+    # @param parameters [SBAuthorizationRule] The shared access authorization rule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -501,11 +735,11 @@ module Azure::ARM::ServiceBus
     #
     # Creates or updates an authorization rule for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Namespace authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
+    # @param parameters [SBAuthorizationRule] The shared access authorization rule.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -529,11 +763,11 @@ module Azure::ARM::ServiceBus
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = SharedAccessAuthorizationRuleCreateOrUpdateParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters, 'parameters')
+      request_mapper = Azure::ARM::ServiceBus::Models::SBAuthorizationRule.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.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -553,7 +787,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -561,8 +795,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = SharedAccessAuthorizationRuleResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBAuthorizationRule.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
@@ -577,9 +811,10 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a namespace authorization rule.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -592,9 +827,10 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a namespace authorization rule.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -607,9 +843,10 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a namespace authorization rule.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -628,7 +865,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -647,7 +884,7 @@ module Azure::ARM::ServiceBus
         response_content = http_response.body
         unless status_code == 204 || 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?
@@ -661,13 +898,14 @@ module Azure::ARM::ServiceBus
     #
     # Gets an authorization rule for a namespace by rule name.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [SharedAccessAuthorizationRuleResource] operation results.
+    # @return [SBAuthorizationRule] operation results.
     #
     def get_authorization_rule(resource_group_name, namespace_name, authorization_rule_name, custom_headers = nil)
       response = get_authorization_rule_async(resource_group_name, namespace_name, authorization_rule_name, custom_headers).value!
@@ -677,9 +915,10 @@ module Azure::ARM::ServiceBus
     #
     # Gets an authorization rule for a namespace by rule name.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -692,9 +931,10 @@ module Azure::ARM::ServiceBus
     #
     # Gets an authorization rule for a namespace by rule name.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] Authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -713,7 +953,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -732,7 +972,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -740,8 +980,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = SharedAccessAuthorizationRuleResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBAuthorizationRule.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
@@ -756,13 +996,14 @@ module Azure::ARM::ServiceBus
     #
     # Gets the primary and secondary connection strings for the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] The authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [ResourceListKeys] operation results.
+    # @return [AccessKeys] operation results.
     #
     def list_keys(resource_group_name, namespace_name, authorization_rule_name, custom_headers = nil)
       response = list_keys_async(resource_group_name, namespace_name, authorization_rule_name, custom_headers).value!
@@ -772,9 +1013,10 @@ module Azure::ARM::ServiceBus
     #
     # Gets the primary and secondary connection strings for the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] The authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -787,9 +1029,10 @@ module Azure::ARM::ServiceBus
     #
     # Gets the primary and secondary connection strings for the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] The authorization rule name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -808,7 +1051,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/listKeys'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/listKeys'
 
       request_url = @base_url || @client.base_url
 
@@ -827,7 +1070,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -835,8 +1078,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ResourceListKeys.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::AccessKeys.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
@@ -851,15 +1094,16 @@ module Azure::ARM::ServiceBus
     #
     # Regenerates the primary or secondary connection strings for the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
+    # @param parameters [RegenerateAccessKeyParameters] Parameters supplied to
     # regenerate the authorization rule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [ResourceListKeys] operation results.
+    # @return [AccessKeys] operation results.
     #
     def regenerate_keys(resource_group_name, namespace_name, authorization_rule_name, parameters, custom_headers = nil)
       response = regenerate_keys_async(resource_group_name, namespace_name, authorization_rule_name, parameters, custom_headers).value!
@@ -869,10 +1113,11 @@ module Azure::ARM::ServiceBus
     #
     # Regenerates the primary or secondary connection strings for the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
+    # @param parameters [RegenerateAccessKeyParameters] Parameters supplied to
     # regenerate the authorization rule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
@@ -886,10 +1131,11 @@ module Azure::ARM::ServiceBus
     #
     # Regenerates the primary or secondary connection strings for the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param authorization_rule_name [String] The authorizationrule name.
+    # @param parameters [RegenerateAccessKeyParameters] Parameters supplied to
     # regenerate the authorization rule.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
@@ -914,11 +1160,11 @@ module Azure::ARM::ServiceBus
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = RegenerateKeysParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters, 'parameters')
+      request_mapper = Azure::ARM::ServiceBus::Models::RegenerateAccessKeyParameters.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.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/regenerateKeys'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/regenerateKeys'
 
       request_url = @base_url || @client.base_url
 
@@ -938,7 +1184,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -946,8 +1192,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ResourceListKeys.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::AccessKeys.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
@@ -963,14 +1209,15 @@ module Azure::ARM::ServiceBus
     # Creates or updates a service namespace. Once created, this namespace's
     # resource manifest is immutable. This operation is idempotent.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param namespace_name [String] The namespace name.
-    # @param parameters [NamespaceCreateOrUpdateParameters] Parameters supplied to
-    # create a namespace resource.
+    # @param parameters [SBNamespace] Parameters supplied to create a namespace
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceResource] operation results.
+    # @return [SBNamespace] operation results.
     #
     def begin_create_or_update(resource_group_name, namespace_name, parameters, custom_headers = nil)
       response = begin_create_or_update_async(resource_group_name, namespace_name, parameters, custom_headers).value!
@@ -981,10 +1228,11 @@ module Azure::ARM::ServiceBus
     # Creates or updates a service namespace. Once created, this namespace's
     # resource manifest is immutable. This operation is idempotent.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param namespace_name [String] The namespace name.
-    # @param parameters [NamespaceCreateOrUpdateParameters] Parameters supplied to
-    # create a namespace resource.
+    # @param parameters [SBNamespace] Parameters supplied to create a namespace
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -998,10 +1246,11 @@ module Azure::ARM::ServiceBus
     # Creates or updates a service namespace. Once created, this namespace's
     # resource manifest is immutable. This operation is idempotent.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param namespace_name [String] The namespace name.
-    # @param parameters [NamespaceCreateOrUpdateParameters] Parameters supplied to
-    # create a namespace resource.
+    # @param parameters [SBNamespace] Parameters supplied to create a namespace
+    # resource.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -1024,11 +1273,11 @@ module Azure::ARM::ServiceBus
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = NamespaceCreateOrUpdateParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters, 'parameters')
+      request_mapper = Azure::ARM::ServiceBus::Models::SBNamespace.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.ServiceBus/namespaces/{namespaceName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}'
 
       request_url = @base_url || @client.base_url
 
@@ -1048,7 +1297,7 @@ module Azure::ARM::ServiceBus
         response_content = http_response.body
         unless status_code == 201 || status_code == 200 || status_code == 202
           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?
@@ -1056,8 +1305,8 @@ module Azure::ARM::ServiceBus
         if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = NamespaceResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespace.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
@@ -1066,8 +1315,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = NamespaceResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespace.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
@@ -1083,8 +1332,9 @@ module Azure::ARM::ServiceBus
     # Deletes an existing namespace. This operation also removes all associated
     # resources under the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -1098,8 +1348,9 @@ module Azure::ARM::ServiceBus
     # Deletes an existing namespace. This operation also removes all associated
     # resources under the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -1113,8 +1364,9 @@ module Azure::ARM::ServiceBus
     # Deletes an existing namespace. This operation also removes all associated
     # resources under the namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -1132,7 +1384,7 @@ module Azure::ARM::ServiceBus
       # 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.ServiceBus/namespaces/{namespaceName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}'
 
       request_url = @base_url || @client.base_url
 
@@ -1151,7 +1403,7 @@ module Azure::ARM::ServiceBus
         response_content = http_response.body
         unless status_code == 204 || status_code == 200 || status_code == 202
           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?
@@ -1171,10 +1423,10 @@ module Azure::ARM::ServiceBus
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceListResult] operation results.
+    # @return [SBNamespaceListResult] operation results.
     #
-    def list_by_subscription_next(next_page_link, custom_headers = nil)
-      response = list_by_subscription_next_async(next_page_link, custom_headers).value!
+    def list_next(next_page_link, custom_headers = nil)
+      response = list_next_async(next_page_link, custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -1189,8 +1441,8 @@ module Azure::ARM::ServiceBus
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_subscription_next_with_http_info(next_page_link, custom_headers = nil)
-      list_by_subscription_next_async(next_page_link, custom_headers).value!
+    def list_next_with_http_info(next_page_link, custom_headers = nil)
+      list_next_async(next_page_link, custom_headers).value!
     end
 
     #
@@ -1204,7 +1456,7 @@ module Azure::ARM::ServiceBus
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_subscription_next_async(next_page_link, custom_headers = nil)
+    def list_next_async(next_page_link, custom_headers = nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -1231,7 +1483,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -1239,8 +1491,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = NamespaceListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespaceListResult.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
@@ -1260,7 +1512,7 @@ module Azure::ARM::ServiceBus
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceListResult] operation results.
+    # @return [SBNamespaceListResult] operation results.
     #
     def list_by_resource_group_next(next_page_link, custom_headers = nil)
       response = list_by_resource_group_next_async(next_page_link, custom_headers).value!
@@ -1318,7 +1570,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -1326,8 +1578,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = NamespaceListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBNamespaceListResult.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
@@ -1347,7 +1599,7 @@ module Azure::ARM::ServiceBus
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [SharedAccessAuthorizationRuleListResult] operation results.
+    # @return [SBAuthorizationRuleListResult] operation results.
     #
     def list_authorization_rules_next(next_page_link, custom_headers = nil)
       response = list_authorization_rules_next_async(next_page_link, custom_headers).value!
@@ -1405,7 +1657,7 @@ module Azure::ARM::ServiceBus
         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?
@@ -1413,8 +1665,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = SharedAccessAuthorizationRuleListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBAuthorizationRuleListResult.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
@@ -1433,15 +1685,15 @@ module Azure::ARM::ServiceBus
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceListResult] which provide lazy access to pages of the
+    # @return [SBNamespaceListResult] which provide lazy access to pages of the
     # response.
     #
-    def list_by_subscription_as_lazy(custom_headers = nil)
-      response = list_by_subscription_async(custom_headers).value!
+    def list_as_lazy(custom_headers = nil)
+      response = list_async(custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_by_subscription_next_async(next_page_link, custom_headers)
+          list_next_async(next_page_link, custom_headers)
         end
         page
       end
@@ -1450,11 +1702,12 @@ module Azure::ARM::ServiceBus
     #
     # Gets the available namespaces within a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [NamespaceListResult] which provide lazy access to pages of the
+    # @return [SBNamespaceListResult] which provide lazy access to pages of the
     # response.
     #
     def list_by_resource_group_as_lazy(resource_group_name, custom_headers = nil)
@@ -1471,13 +1724,14 @@ module Azure::ARM::ServiceBus
     #
     # Gets the authorization rules for a namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [SharedAccessAuthorizationRuleListResult] which provide lazy access
-    # to pages of the response.
+    # @return [SBAuthorizationRuleListResult] which provide lazy access to pages of
+    # the response.
     #
     def list_authorization_rules_as_lazy(resource_group_name, namespace_name, custom_headers = nil)
       response = list_authorization_rules_async(resource_group_name, namespace_name, custom_headers).value!