azure_mgmt_service_bus 0.10.0 → 0.11.0

data/lib/generated/azure_mgmt_service_bus/operations.rb

@@ -0,0 +1,213 @@
+# 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
+  #
+  # Azure Service Bus client
+  #
+  class Operations
+    include MsRestAzure
+
+    #
+    # Creates and initializes a new instance of the Operations class.
+    # @param client service class for accessing basic functionality.
+    #
+    def initialize(client)
+      @client = client
+    end
+
+    # @return [ServiceBusManagementClient] reference to the ServiceBusManagementClient
+    attr_reader :client
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [Array<Operation>] operation results.
+    #
+    def list(custom_headers = nil)
+      first_page = list_as_lazy(custom_headers)
+      first_page.get_all_items
+    end
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @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_with_http_info(custom_headers = nil)
+      list_async(custom_headers).value!
+    end
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @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_async(custom_headers = nil)
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.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?
+      path_template = 'providers/Microsoft.ServiceBus/operations'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          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?
+        # 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::OperationListResult.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
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @param next_page_link [String] The NextLink from the previous successful call
+    # to List operation.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [OperationListResult] operation results.
+    #
+    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
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @param next_page_link [String] The NextLink from the previous successful call
+    # to List operation.
+    # @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_next_with_http_info(next_page_link, custom_headers = nil)
+      list_next_async(next_page_link, custom_headers).value!
+    end
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @param next_page_link [String] The NextLink from the previous successful call
+    # to List operation.
+    # @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_next_async(next_page_link, custom_headers = nil)
+      fail ArgumentError, 'next_page_link is nil' if next_page_link.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?
+      path_template = '{nextLink}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          skip_encoding_path_params: {'nextLink' => next_page_link},
+          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?
+        # 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::OperationListResult.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
+
+    #
+    # Lists all of the available ServiceBus REST API operations.
+    #
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [OperationListResult] which provide lazy access to pages of the
+    # response.
+    #
+    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_next_async(next_page_link, custom_headers)
+        end
+        page
+      end
+    end
+
+  end
+end

data/lib/generated/azure_mgmt_service_bus/queues.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 Queues
-    include Azure::ARM::ServiceBus::Models
     include MsRestAzure
 
     #
@@ -25,43 +24,46 @@ module Azure::ARM::ServiceBus
     #
     # Gets the queues within 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<QueueResource>] operation results.
+    # @return [Array<SBQueue>] operation results.
     #
-    def list_all(resource_group_name, namespace_name, custom_headers = nil)
-      first_page = list_all_as_lazy(resource_group_name, namespace_name, custom_headers)
+    def list_by_namespace(resource_group_name, namespace_name, custom_headers = nil)
+      first_page = list_by_namespace_as_lazy(resource_group_name, namespace_name, custom_headers)
       first_page.get_all_items
     end
 
     #
     # Gets the queues within 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 [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_all_with_http_info(resource_group_name, namespace_name, custom_headers = nil)
-      list_all_async(resource_group_name, namespace_name, custom_headers).value!
+    def list_by_namespace_with_http_info(resource_group_name, namespace_name, custom_headers = nil)
+      list_by_namespace_async(resource_group_name, namespace_name, custom_headers).value!
     end
 
     #
     # Gets the queues within 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.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_all_async(resource_group_name, namespace_name, custom_headers = nil)
+    def list_by_namespace_async(resource_group_name, namespace_name, 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, '@client.api_version is nil' if @client.api_version.nil?
@@ -73,7 +75,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}/queues'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues'
 
       request_url = @base_url || @client.base_url
 
@@ -92,7 +94,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?
@@ -100,8 +102,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = QueueListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBQueueListResult.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
@@ -116,15 +118,16 @@ module Azure::ARM::ServiceBus
     #
     # Creates or updates a Service Bus queue. This operation is idempotent.
     #
-    # @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 queue_name [String] The queue name.
-    # @param parameters [QueueCreateOrUpdateParameters] Parameters supplied to
-    # create or update a queue resource.
+    # @param parameters [SBQueue] Parameters supplied to create or update a queue
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [QueueResource] operation results.
+    # @return [SBQueue] operation results.
     #
     def create_or_update(resource_group_name, namespace_name, queue_name, parameters, custom_headers = nil)
       response = create_or_update_async(resource_group_name, namespace_name, queue_name, parameters, custom_headers).value!
@@ -134,11 +137,12 @@ module Azure::ARM::ServiceBus
     #
     # Creates or updates a Service Bus queue. This operation is idempotent.
     #
-    # @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 queue_name [String] The queue name.
-    # @param parameters [QueueCreateOrUpdateParameters] Parameters supplied to
-    # create or update a queue resource.
+    # @param parameters [SBQueue] Parameters supplied to create or update a queue
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -151,11 +155,12 @@ module Azure::ARM::ServiceBus
     #
     # Creates or updates a Service Bus queue. This operation is idempotent.
     #
-    # @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 queue_name [String] The queue name.
-    # @param parameters [QueueCreateOrUpdateParameters] Parameters supplied to
-    # create or update a queue resource.
+    # @param parameters [SBQueue] Parameters supplied to create or update a queue
+    # resource.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -179,11 +184,11 @@ module Azure::ARM::ServiceBus
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = QueueCreateOrUpdateParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters, 'parameters')
+      request_mapper = Azure::ARM::ServiceBus::Models::SBQueue.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}/queues/{queueName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}'
 
       request_url = @base_url || @client.base_url
 
@@ -203,7 +208,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?
@@ -211,8 +216,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = QueueResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBQueue.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
@@ -227,9 +232,10 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a queue from the specified namespace in a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param queue_name [String] The name of the queue to be deleted.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param queue_name [String] The queue name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -242,9 +248,10 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a queue from the specified namespace in a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param queue_name [String] The name of the queue to be deleted.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param queue_name [String] The queue name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -257,9 +264,10 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a queue from the specified namespace in a resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param queue_name [String] The name of the queue to be deleted.
+    # @param resource_group_name [String] Name of the Resource group within the
+    # Azure subscription.
+    # @param namespace_name [String] The namespace name
+    # @param queue_name [String] The queue name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -278,7 +286,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}/queues/{queueName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}'
 
       request_url = @base_url || @client.base_url
 
@@ -297,7 +305,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?
@@ -311,13 +319,14 @@ module Azure::ARM::ServiceBus
     #
     # Returns a description for the specified queue.
     #
-    # @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 queue_name [String] The queue name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [QueueResource] operation results.
+    # @return [SBQueue] operation results.
     #
     def get(resource_group_name, namespace_name, queue_name, custom_headers = nil)
       response = get_async(resource_group_name, namespace_name, queue_name, custom_headers).value!
@@ -327,8 +336,9 @@ module Azure::ARM::ServiceBus
     #
     # Returns a description for the specified queue.
     #
-    # @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 queue_name [String] The queue name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
@@ -342,8 +352,9 @@ module Azure::ARM::ServiceBus
     #
     # Returns a description for the specified queue.
     #
-    # @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 queue_name [String] The queue name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
@@ -363,7 +374,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}/queues/{queueName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}'
 
       request_url = @base_url || @client.base_url
 
@@ -382,7 +393,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?
@@ -390,8 +401,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = QueueResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBQueue.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
@@ -406,13 +417,14 @@ module Azure::ARM::ServiceBus
     #
     # Gets all authorization rules for a queue.
     #
-    # @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 queue_name [String] The queue 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, queue_name, custom_headers = nil)
       first_page = list_authorization_rules_as_lazy(resource_group_name, namespace_name, queue_name, custom_headers)
@@ -422,7 +434,8 @@ module Azure::ARM::ServiceBus
     #
     # Gets all authorization rules for a queue.
     #
-    # @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 queue_name [String] The queue name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -437,7 +450,8 @@ module Azure::ARM::ServiceBus
     #
     # Gets all authorization rules for a queue.
     #
-    # @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 queue_name [String] The queue name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -458,7 +472,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}/queues/{queueName}/authorizationRules'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}/authorizationRules'
 
       request_url = @base_url || @client.base_url
 
@@ -477,7 +491,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?
@@ -485,8 +499,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
@@ -501,16 +515,16 @@ module Azure::ARM::ServiceBus
     #
     # Creates an authorization rule for a queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @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, queue_name, authorization_rule_name, parameters, custom_headers = nil)
       response = create_or_update_authorization_rule_async(resource_group_name, namespace_name, queue_name, authorization_rule_name, parameters, custom_headers).value!
@@ -520,12 +534,12 @@ module Azure::ARM::ServiceBus
     #
     # Creates an authorization rule for a queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @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.
     #
@@ -538,12 +552,12 @@ module Azure::ARM::ServiceBus
     #
     # Creates an authorization rule for a queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @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.
     #
@@ -568,11 +582,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}/queues/{queueName}/authorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}/authorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -592,7 +606,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?
@@ -600,8 +614,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
@@ -616,10 +630,11 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a queue authorization rule.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule 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.
     #
@@ -632,10 +647,11 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a queue authorization rule.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule 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.
     #
@@ -648,10 +664,11 @@ module Azure::ARM::ServiceBus
     #
     # Deletes a queue authorization rule.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule 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.
     #
@@ -671,7 +688,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}/queues/{queueName}/authorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}/authorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -690,7 +707,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?
@@ -704,14 +721,15 @@ module Azure::ARM::ServiceBus
     #
     # Gets an authorization rule for a queue by rule name.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule 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, queue_name, authorization_rule_name, custom_headers = nil)
       response = get_authorization_rule_async(resource_group_name, namespace_name, queue_name, authorization_rule_name, custom_headers).value!
@@ -721,10 +739,11 @@ module Azure::ARM::ServiceBus
     #
     # Gets an authorization rule for a queue by rule name.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule 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.
     #
@@ -737,10 +756,11 @@ module Azure::ARM::ServiceBus
     #
     # Gets an authorization rule for a queue by rule name.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] Authorization rule 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.
     #
@@ -760,7 +780,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}/queues/{queueName}/authorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}/authorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -779,7 +799,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?
@@ -787,8 +807,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
@@ -803,14 +823,15 @@ module Azure::ARM::ServiceBus
     #
     # Primary and secondary connection strings to the queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] The authorization rule 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, queue_name, authorization_rule_name, custom_headers = nil)
       response = list_keys_async(resource_group_name, namespace_name, queue_name, authorization_rule_name, custom_headers).value!
@@ -820,10 +841,11 @@ module Azure::ARM::ServiceBus
     #
     # Primary and secondary connection strings to the queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] The authorization rule 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.
     #
@@ -836,10 +858,11 @@ module Azure::ARM::ServiceBus
     #
     # Primary and secondary connection strings to the queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] The authorization rule 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.
     #
@@ -859,7 +882,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}/queues/{queueName}/authorizationRules/{authorizationRuleName}/ListKeys'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}/authorizationRules/{authorizationRuleName}/ListKeys'
 
       request_url = @base_url || @client.base_url
 
@@ -878,7 +901,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?
@@ -886,8 +909,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
@@ -902,16 +925,17 @@ module Azure::ARM::ServiceBus
     #
     # Regenerates the primary or secondary connection strings to the queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
+    # @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, queue_name, authorization_rule_name, parameters, custom_headers = nil)
       response = regenerate_keys_async(resource_group_name, namespace_name, queue_name, authorization_rule_name, parameters, custom_headers).value!
@@ -921,11 +945,12 @@ module Azure::ARM::ServiceBus
     #
     # Regenerates the primary or secondary connection strings to the queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
+    # @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.
@@ -939,11 +964,12 @@ module Azure::ARM::ServiceBus
     #
     # Regenerates the primary or secondary connection strings to the queue.
     #
-    # @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 queue_name [String] The queue name.
-    # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
+    # @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.
@@ -969,11 +995,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}/queues/{queueName}/authorizationRules/{authorizationRuleName}/regenerateKeys'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/queues/{queueName}/authorizationRules/{authorizationRuleName}/regenerateKeys'
 
       request_url = @base_url || @client.base_url
 
@@ -993,7 +1019,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?
@@ -1001,8 +1027,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
@@ -1022,10 +1048,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 [QueueListResult] operation results.
+    # @return [SBQueueListResult] operation results.
     #
-    def list_all_next(next_page_link, custom_headers = nil)
-      response = list_all_next_async(next_page_link, custom_headers).value!
+    def list_by_namespace_next(next_page_link, custom_headers = nil)
+      response = list_by_namespace_next_async(next_page_link, custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -1039,8 +1065,8 @@ module Azure::ARM::ServiceBus
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_all_next_with_http_info(next_page_link, custom_headers = nil)
-      list_all_next_async(next_page_link, custom_headers).value!
+    def list_by_namespace_next_with_http_info(next_page_link, custom_headers = nil)
+      list_by_namespace_next_async(next_page_link, custom_headers).value!
     end
 
     #
@@ -1053,7 +1079,7 @@ module Azure::ARM::ServiceBus
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_all_next_async(next_page_link, custom_headers = nil)
+    def list_by_namespace_next_async(next_page_link, custom_headers = nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -1080,7 +1106,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?
@@ -1088,8 +1114,8 @@ module Azure::ARM::ServiceBus
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = QueueListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::ServiceBus::Models::SBQueueListResult.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
@@ -1109,7 +1135,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!
@@ -1167,7 +1193,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?
@@ -1175,8 +1201,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
@@ -1191,19 +1217,21 @@ module Azure::ARM::ServiceBus
     #
     # Gets the queues within 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 [QueueListResult] which provide lazy access to pages of the response.
+    # @return [SBQueueListResult] which provide lazy access to pages of the
+    # response.
     #
-    def list_all_as_lazy(resource_group_name, namespace_name, custom_headers = nil)
-      response = list_all_async(resource_group_name, namespace_name, custom_headers).value!
+    def list_by_namespace_as_lazy(resource_group_name, namespace_name, custom_headers = nil)
+      response = list_by_namespace_async(resource_group_name, namespace_name, custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_all_next_async(next_page_link, custom_headers)
+          list_by_namespace_next_async(next_page_link, custom_headers)
         end
         page
       end
@@ -1212,14 +1240,15 @@ module Azure::ARM::ServiceBus
     #
     # Gets all authorization rules for a queue.
     #
-    # @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 queue_name [String] The queue 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, queue_name, custom_headers = nil)
       response = list_authorization_rules_async(resource_group_name, namespace_name, queue_name, custom_headers).value!