azure_mgmt_event_hub 0.10.0 → 0.11.0

data/lib/generated/azure_mgmt_event_hub/event_hub_management_client.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.
 
@@ -36,6 +36,9 @@ module Azure::ARM::EventHub
     # is generated and included in each request. Default is true.
     attr_accessor :generate_client_request_id
 
+    # @return [Operations] operations
+    attr_reader :operations
+
     # @return [Namespaces] namespaces
     attr_reader :namespaces
 
@@ -58,10 +61,11 @@ module Azure::ARM::EventHub
       fail ArgumentError, 'invalid type of credentials input parameter' unless credentials.is_a?(MsRest::ServiceClientCredentials) unless credentials.nil?
       @credentials = credentials
 
+      @operations = Operations.new(self)
       @namespaces = Namespaces.new(self)
       @event_hubs = EventHubs.new(self)
       @consumer_groups = ConsumerGroups.new(self)
-      @api_version = '2015-08-01'
+      @api_version = '2017-04-01'
       @accept_language = 'en-US'
       @long_running_operation_retry_timeout = 30
       @generate_client_request_id = true

data/lib/generated/azure_mgmt_event_hub/event_hubs.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::EventHub
   # Azure Event Hubs client
   #
   class EventHubs
-    include Azure::ARM::EventHub::Models
     include MsRestAzure
 
     #
@@ -23,45 +22,48 @@ module Azure::ARM::EventHub
     attr_reader :client
 
     #
-    # Gets all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in 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<EventHubResource>] operation results.
+    # @return [Array<Eventhub>] 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 all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in 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 all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in 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::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs'
 
       request_url = @base_url || @client.base_url
 
@@ -92,7 +94,7 @@ module Azure::ARM::EventHub
         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::EventHub
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = EventHubListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::EventHub::Models::EventHubListResult.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
@@ -114,17 +116,18 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Creates or updates a new Event Hub as a nested resource within a namespace.
+    # Creates or updates a new Event Hub as a nested resource within a Namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param parameters [EventHubCreateOrUpdateParameters] Parameters supplied to
-    # create an Event Hub resource.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param parameters [Eventhub] Parameters supplied to create an Event Hub
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [EventHubResource] operation results.
+    # @return [Eventhub] operation results.
     #
     def create_or_update(resource_group_name, namespace_name, event_hub_name, parameters, custom_headers = nil)
       response = create_or_update_async(resource_group_name, namespace_name, event_hub_name, parameters, custom_headers).value!
@@ -132,13 +135,14 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Creates or updates a new Event Hub as a nested resource within a namespace.
+    # Creates or updates a new Event Hub as a nested resource within a Namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param parameters [EventHubCreateOrUpdateParameters] Parameters supplied to
-    # create an Event Hub resource.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param parameters [Eventhub] Parameters supplied to create an Event Hub
+    # resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -149,13 +153,14 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Creates or updates a new Event Hub as a nested resource within a namespace.
+    # Creates or updates a new Event Hub as a nested resource within a Namespace.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param parameters [EventHubCreateOrUpdateParameters] Parameters supplied to
-    # create an Event Hub resource.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param parameters [Eventhub] Parameters supplied to create an Event Hub
+    # 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::EventHub
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = EventHubCreateOrUpdateParameters.mapper()
-      request_content = @client.serialize(request_mapper,  parameters, 'parameters')
+      request_mapper = Azure::ARM::EventHub::Models::Eventhub.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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}'
 
       request_url = @base_url || @client.base_url
 
@@ -203,7 +208,7 @@ module Azure::ARM::EventHub
         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::EventHub
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = EventHubResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::EventHub::Models::Eventhub.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
@@ -225,11 +230,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Deletes an Event Hub from the specified namespace and resource group.
+    # Deletes an Event Hub from the specified Namespace and resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The name of the Event Hub to delete.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -240,11 +246,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Deletes an Event Hub from the specified namespace and resource group.
+    # Deletes an Event Hub from the specified Namespace and resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The name of the Event Hub to delete.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -255,11 +262,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Deletes an Event Hub from the specified namespace and resource group.
+    # Deletes an Event Hub from the specified Namespace and resource group.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The name of the Event Hub to delete.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub 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::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}'
 
       request_url = @base_url || @client.base_url
 
@@ -297,7 +305,7 @@ module Azure::ARM::EventHub
         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::EventHub
     #
     # Gets an Event Hubs description for the specified Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [EventHubResource] operation results.
+    # @return [Eventhub] operation results.
     #
     def get(resource_group_name, namespace_name, event_hub_name, custom_headers = nil)
       response = get_async(resource_group_name, namespace_name, event_hub_name, custom_headers).value!
@@ -327,9 +336,10 @@ module Azure::ARM::EventHub
     #
     # Gets an Event Hubs description for the specified Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -342,9 +352,10 @@ module Azure::ARM::EventHub
     #
     # Gets an Event Hubs description for the specified Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub 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::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}'
 
       request_url = @base_url || @client.base_url
 
@@ -382,7 +393,7 @@ module Azure::ARM::EventHub
         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::EventHub
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = EventHubResource.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::EventHub::Models::Eventhub.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::EventHub
     #
     # Gets the authorization rules for an Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub 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<AuthorizationRule>] operation results.
     #
     def list_authorization_rules(resource_group_name, namespace_name, event_hub_name, custom_headers = nil)
       first_page = list_authorization_rules_as_lazy(resource_group_name, namespace_name, event_hub_name, custom_headers)
@@ -422,9 +434,10 @@ module Azure::ARM::EventHub
     #
     # Gets the authorization rules for an Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -437,9 +450,10 @@ module Azure::ARM::EventHub
     #
     # Gets the authorization rules for an Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -458,7 +472,7 @@ module Azure::ARM::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules'
 
       request_url = @base_url || @client.base_url
 
@@ -477,7 +491,7 @@ module Azure::ARM::EventHub
         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::EventHub
         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::EventHub::Models::AuthorizationRuleListResult.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
@@ -499,18 +513,18 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Creates or updates an authorization rule for the specified Event Hub.
+    # Creates or updates an AuthorizationRule for the specified Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @param parameters [AuthorizationRule] The shared access AuthorizationRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [SharedAccessAuthorizationRuleResource] operation results.
+    # @return [AuthorizationRule] operation results.
     #
     def create_or_update_authorization_rule(resource_group_name, namespace_name, event_hub_name, authorization_rule_name, parameters, custom_headers = nil)
       response = create_or_update_authorization_rule_async(resource_group_name, namespace_name, event_hub_name, authorization_rule_name, parameters, custom_headers).value!
@@ -518,14 +532,14 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Creates or updates an authorization rule for the specified Event Hub.
+    # Creates or updates an AuthorizationRule for the specified Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @param parameters [AuthorizationRule] The shared access AuthorizationRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -536,14 +550,14 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Creates or updates an authorization rule for the specified Event Hub.
+    # Creates or updates an AuthorizationRule for the specified Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
-    # @param parameters [SharedAccessAuthorizationRuleCreateOrUpdateParameters] The
-    # shared access authorization rule.
+    # @param parameters [AuthorizationRule] The shared access AuthorizationRule.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -568,11 +582,11 @@ module Azure::ARM::EventHub
       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::EventHub::Models::AuthorizationRule.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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -592,7 +606,7 @@ module Azure::ARM::EventHub
         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::EventHub
         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::EventHub::Models::AuthorizationRule.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
@@ -614,16 +628,17 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Gets an authorization rule for an Event Hub by rule name.
+    # Gets an AuthorizationRule for an Event Hub by rule name.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule 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 [AuthorizationRule] operation results.
     #
     def get_authorization_rule(resource_group_name, namespace_name, event_hub_name, authorization_rule_name, custom_headers = nil)
       response = get_authorization_rule_async(resource_group_name, namespace_name, event_hub_name, authorization_rule_name, custom_headers).value!
@@ -631,11 +646,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Gets an authorization rule for an Event Hub by rule name.
+    # Gets an AuthorizationRule for an Event Hub by rule name.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
@@ -647,11 +663,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Gets an authorization rule for an Event Hub by rule name.
+    # Gets an AuthorizationRule for an Event Hub by rule name.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
@@ -672,7 +689,7 @@ module Azure::ARM::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -691,7 +708,7 @@ module Azure::ARM::EventHub
         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?
@@ -699,8 +716,8 @@ module Azure::ARM::EventHub
         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::EventHub::Models::AuthorizationRule.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
@@ -713,11 +730,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Deletes an Event Hubs authorization rule.
+    # Deletes an Event Hub AuthorizationRule.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
@@ -729,11 +747,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Deletes an Event Hubs authorization rule.
+    # Deletes an Event Hub AuthorizationRule.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
@@ -745,11 +764,12 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Deletes an Event Hubs authorization rule.
+    # Deletes an Event Hub AuthorizationRule.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
     # @param authorization_rule_name [String] The authorization rule name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
@@ -770,7 +790,7 @@ module Azure::ARM::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}'
 
       request_url = @base_url || @client.base_url
 
@@ -789,7 +809,7 @@ module Azure::ARM::EventHub
         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?
@@ -803,15 +823,15 @@ module Azure::ARM::EventHub
     #
     # Gets the ACS and SAS connection strings for the Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param authorization_rule_name [String] The connection string of the
-    # namespace for the specified authorization rule.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param authorization_rule_name [String] The authorization rule 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, event_hub_name, authorization_rule_name, custom_headers = nil)
       response = list_keys_async(resource_group_name, namespace_name, event_hub_name, authorization_rule_name, custom_headers).value!
@@ -821,11 +841,11 @@ module Azure::ARM::EventHub
     #
     # Gets the ACS and SAS connection strings for the Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param authorization_rule_name [String] The connection string of the
-    # namespace for the specified authorization rule.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param authorization_rule_name [String] The authorization rule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -838,11 +858,11 @@ module Azure::ARM::EventHub
     #
     # Gets the ACS and SAS connection strings for the Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param authorization_rule_name [String] The connection string of the
-    # namespace for the specified authorization rule.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param authorization_rule_name [String] The authorization rule name.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -862,7 +882,7 @@ module Azure::ARM::EventHub
       # 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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/ListKeys'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/ListKeys'
 
       request_url = @base_url || @client.base_url
 
@@ -881,7 +901,7 @@ module Azure::ARM::EventHub
         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?
@@ -889,8 +909,8 @@ module Azure::ARM::EventHub
         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::EventHub::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
@@ -905,17 +925,17 @@ module Azure::ARM::EventHub
     #
     # Regenerates the ACS and SAS connection strings for the Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param authorization_rule_name [String] The connection string of the Event
-    # Hub for the specified authorization rule.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
-    # regenerate the authorization rule.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param authorization_rule_name [String] The authorization rule name.
+    # @param parameters [RegenerateAccessKeyParameters] Parameters supplied to
+    # regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
     # @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, event_hub_name, authorization_rule_name, parameters, custom_headers = nil)
       response = regenerate_keys_async(resource_group_name, namespace_name, event_hub_name, authorization_rule_name, parameters, custom_headers).value!
@@ -925,13 +945,13 @@ module Azure::ARM::EventHub
     #
     # Regenerates the ACS and SAS connection strings for the Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param authorization_rule_name [String] The connection string of the Event
-    # Hub for the specified authorization rule.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
-    # regenerate the authorization rule.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param authorization_rule_name [String] The authorization rule name.
+    # @param parameters [RegenerateAccessKeyParameters] Parameters supplied to
+    # regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -944,13 +964,13 @@ module Azure::ARM::EventHub
     #
     # Regenerates the ACS and SAS connection strings for the Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name.
-    # @param event_hub_name [String] The Event Hub name.
-    # @param authorization_rule_name [String] The connection string of the Event
-    # Hub for the specified authorization rule.
-    # @param parameters [RegenerateKeysParameters] Parameters supplied to
-    # regenerate the authorization rule.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub name
+    # @param authorization_rule_name [String] The authorization rule name.
+    # @param parameters [RegenerateAccessKeyParameters] Parameters supplied to
+    # regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -975,11 +995,11 @@ module Azure::ARM::EventHub
       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::EventHub::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.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/regenerateKeys'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/regenerateKeys'
 
       request_url = @base_url || @client.base_url
 
@@ -999,7 +1019,7 @@ module Azure::ARM::EventHub
         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?
@@ -1007,8 +1027,8 @@ module Azure::ARM::EventHub
         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::EventHub::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
@@ -1021,7 +1041,7 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Gets all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in a Namespace.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1030,13 +1050,13 @@ module Azure::ARM::EventHub
     #
     # @return [EventHubListResult] 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
 
     #
-    # Gets all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in a Namespace.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1045,12 +1065,12 @@ module Azure::ARM::EventHub
     #
     # @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
 
     #
-    # Gets all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in a Namespace.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1059,7 +1079,7 @@ module Azure::ARM::EventHub
     #
     # @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?
 
 
@@ -1086,7 +1106,7 @@ module Azure::ARM::EventHub
         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?
@@ -1094,8 +1114,8 @@ module Azure::ARM::EventHub
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = EventHubListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
+            result_mapper = Azure::ARM::EventHub::Models::EventHubListResult.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
@@ -1115,7 +1135,7 @@ module Azure::ARM::EventHub
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [SharedAccessAuthorizationRuleListResult] operation results.
+    # @return [AuthorizationRuleListResult] 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!
@@ -1173,7 +1193,7 @@ module Azure::ARM::EventHub
         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?
@@ -1181,8 +1201,8 @@ module Azure::ARM::EventHub
         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::EventHub::Models::AuthorizationRuleListResult.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
@@ -1195,22 +1215,23 @@ module Azure::ARM::EventHub
     end
 
     #
-    # Gets all the Event Hubs in a namespace.
+    # Gets all the Event Hubs in 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 [EventHubListResult] 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
@@ -1219,14 +1240,15 @@ module Azure::ARM::EventHub
     #
     # Gets the authorization rules for an Event Hub.
     #
-    # @param resource_group_name [String] The name of the resource group.
-    # @param namespace_name [String] The namespace name
-    # @param event_hub_name [String] The Event Hub name.
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param event_hub_name [String] The Event Hub 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 [AuthorizationRuleListResult] which provide lazy access to pages of
+    # the response.
     #
     def list_authorization_rules_as_lazy(resource_group_name, namespace_name, event_hub_name, custom_headers = nil)
       response = list_authorization_rules_async(resource_group_name, namespace_name, event_hub_name, custom_headers).value!