azure_mgmt_event_hub 0.17.1 → 0.18.2

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/private_link_connection_status.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::EventHub::Mgmt::V2018_01_01_preview
+  module Models
+    #
+    # Defines values for PrivateLinkConnectionStatus
+    #
+    module PrivateLinkConnectionStatus
+      Pending = "Pending"
+      Approved = "Approved"
+      Rejected = "Rejected"
+      Disconnected = "Disconnected"
+    end
+  end
+end

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/private_link_resource.rb

@@ -0,0 +1,119 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::EventHub::Mgmt::V2018_01_01_preview
+  module Models
+    #
+    # Information of the private link resource.
+    #
+    class PrivateLinkResource
+
+      include MsRestAzure
+
+      # @return [String] The private link resource group id.
+      attr_accessor :group_id
+
+      # @return [Array<String>] The private link resource required member
+      # names.
+      attr_accessor :required_members
+
+      # @return [Array<String>] The private link resource Private link DNS zone
+      # name.
+      attr_accessor :required_zone_names
+
+      # @return [String] Fully qualified identifier of the resource.
+      attr_accessor :id
+
+      # @return [String] Name of the resource
+      attr_accessor :name
+
+      # @return [String] Type of the resource
+      attr_accessor :type
+
+
+      #
+      # Mapper for PrivateLinkResource class as Ruby Hash.
+      # This will be used for serialization/deserialization.
+      #
+      def self.mapper()
+        {
+          client_side_validation: true,
+          required: false,
+          serialized_name: 'PrivateLinkResource',
+          type: {
+            name: 'Composite',
+            class_name: 'PrivateLinkResource',
+            model_properties: {
+              group_id: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'properties.groupId',
+                type: {
+                  name: 'String'
+                }
+              },
+              required_members: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'properties.requiredMembers',
+                type: {
+                  name: 'Sequence',
+                  element: {
+                      client_side_validation: true,
+                      required: false,
+                      serialized_name: 'StringElementType',
+                      type: {
+                        name: 'String'
+                      }
+                  }
+                }
+              },
+              required_zone_names: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'properties.requiredZoneNames',
+                type: {
+                  name: 'Sequence',
+                  element: {
+                      client_side_validation: true,
+                      required: false,
+                      serialized_name: 'StringElementType',
+                      type: {
+                        name: 'String'
+                      }
+                  }
+                }
+              },
+              id: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'id',
+                type: {
+                  name: 'String'
+                }
+              },
+              name: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'name',
+                type: {
+                  name: 'String'
+                }
+              },
+              type: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'type',
+                type: {
+                  name: 'String'
+                }
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/private_link_resources_list_result.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::EventHub::Mgmt::V2018_01_01_preview
+  module Models
+    #
+    # Result of the List private link resources operation.
+    #
+    class PrivateLinkResourcesListResult
+
+      include MsRestAzure
+
+      # @return [Array<PrivateLinkResource>] A collection of private link
+      # resources
+      attr_accessor :value
+
+      # @return [String] A link for the next page of private link resources.
+      attr_accessor :next_link
+
+
+      #
+      # Mapper for PrivateLinkResourcesListResult class as Ruby Hash.
+      # This will be used for serialization/deserialization.
+      #
+      def self.mapper()
+        {
+          client_side_validation: true,
+          required: false,
+          serialized_name: 'PrivateLinkResourcesListResult',
+          type: {
+            name: 'Composite',
+            class_name: 'PrivateLinkResourcesListResult',
+            model_properties: {
+              value: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'value',
+                type: {
+                  name: 'Sequence',
+                  element: {
+                      client_side_validation: true,
+                      required: false,
+                      serialized_name: 'PrivateLinkResourceElementType',
+                      type: {
+                        name: 'Composite',
+                        class_name: 'PrivateLinkResource'
+                      }
+                  }
+                }
+              },
+              next_link: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'nextLink',
+                type: {
+                  name: 'String'
+                }
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/resource.rb

@@ -6,19 +6,19 @@
 module Azure::EventHub::Mgmt::V2018_01_01_preview
   module Models
     #
-    # The Resource definition
+    # The resource definition.
     #
     class Resource
 
       include MsRestAzure
 
-      # @return [String] Resource Id
+      # @return [String] Resource ID.
       attr_accessor :id
 
-      # @return [String] Resource name
+      # @return [String] Resource name.
       attr_accessor :name
 
-      # @return [String] Resource type
+      # @return [String] Resource type.
       attr_accessor :type
 
 

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/sku.rb

@@ -20,7 +20,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # values include: 'Basic', 'Standard'
       attr_accessor :tier
 
-      # @return [Integer] The Event Hubs throughput units, vaule should be 0 to
+      # @return [Integer] The Event Hubs throughput units, value should be 0 to
       # 20 throughput units.
       attr_accessor :capacity
 

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/subnet.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::EventHub::Mgmt::V2018_01_01_preview
+  module Models
+    #
+    # Properties supplied for Subnet
+    #
+    class Subnet
+
+      include MsRestAzure
+
+      # @return [String] Resource ID of Virtual Network Subnet
+      attr_accessor :id
+
+
+      #
+      # Mapper for Subnet class as Ruby Hash.
+      # This will be used for serialization/deserialization.
+      #
+      def self.mapper()
+        {
+          client_side_validation: true,
+          required: false,
+          serialized_name: 'Subnet',
+          type: {
+            name: 'Composite',
+            class_name: 'Subnet',
+            model_properties: {
+              id: {
+                client_side_validation: true,
+                required: false,
+                serialized_name: 'id',
+                type: {
+                  name: 'String'
+                }
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/tracked_resource.rb

@@ -6,16 +6,16 @@
 module Azure::EventHub::Mgmt::V2018_01_01_preview
   module Models
     #
-    # Definition of an Azure resource.
+    # Definition of resource.
     #
     class TrackedResource < Resource
 
       include MsRestAzure
 
-      # @return [String] Resource location
+      # @return [String] Resource location.
       attr_accessor :location
 
-      # @return [Hash{String => String}] Resource tags
+      # @return [Hash{String => String}] Resource tags.
       attr_accessor :tags
 
 

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/models/virtual_network_rule_list_result.rb

@@ -13,8 +13,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       include MsRestAzure
 
       include MsRest::JSONable
-      # @return [Array<IpFilterRule>] Result of the List VirtualNetwork Rules
-      # operation.
+      # @return [Array<VirtualNetworkRule>] Result of the List VirtualNetwork
+      # Rules operation.
       attr_accessor :value
 
       # @return [String] Link to the next set of results. Not empty if Value
@@ -27,12 +27,12 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       #
       # Gets the rest of the items for the request, enabling auto-pagination.
       #
-      # @return [Array<IpFilterRule>] operation results.
+      # @return [Array<VirtualNetworkRule>] operation results.
       #
       def get_all_items
         items = @value
         page = self
-        while page.next_link != nil do
+        while page.next_link != nil && !page.next_link.strip.empty? do
           page = page.get_next_page
           items.concat(page.value)
         end
@@ -75,10 +75,10 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
                   element: {
                       client_side_validation: true,
                       required: false,
-                      serialized_name: 'IpFilterRuleElementType',
+                      serialized_name: 'VirtualNetworkRuleElementType',
                       type: {
                         name: 'Composite',
-                        class_name: 'IpFilterRule'
+                        class_name: 'VirtualNetworkRule'
                       }
                   }
                 }

data/lib/2018-01-01-preview/generated/azure_mgmt_event_hub/namespaces.rb

@@ -19,9 +19,428 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       @client = client
     end
 
-    # @return [EventHub2018PreviewManagementClient] reference to the EventHub2018PreviewManagementClient
+    # @return [EventHubManagementClient] reference to the EventHubManagementClient
     attr_reader :client
 
+    #
+    # Gets a list of IP Filter rules for a Namespace.
+    #
+    # @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<IpFilterRule>] operation results.
+    #
+    def list_ipfilter_rules(resource_group_name, namespace_name, custom_headers:nil)
+      first_page = list_ipfilter_rules_as_lazy(resource_group_name, namespace_name, custom_headers:custom_headers)
+      first_page.get_all_items
+    end
+
+    #
+    # Gets a list of IP Filter rules for a Namespace.
+    #
+    # @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_ipfilter_rules_with_http_info(resource_group_name, namespace_name, custom_headers:nil)
+      list_ipfilter_rules_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
+    end
+
+    #
+    # Gets a list of IP Filter rules for a Namespace.
+    #
+    # @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_ipfilter_rules_async(resource_group_name, namespace_name, custom_headers:nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
+      fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
+      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+
+
+      request_headers = {}
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {}),
+          base_url: request_url
+      }
+      promise = @client.make_request_async(:get, path_template, options)
+
+      promise = promise.then do |result|
+        http_response = result.response
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 200
+          error_model = JSON.load(response_content)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
+        end
+
+        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRuleListResult.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
+
+    #
+    # Creates or updates an IpFilterRule for a Namespace.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param parameters [IpFilterRule] The Namespace IpFilterRule.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [IpFilterRule] operation results.
+    #
+    def create_or_update_ip_filter_rule(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:nil)
+      response = create_or_update_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:custom_headers).value!
+      response.body unless response.nil?
+    end
+
+    #
+    # Creates or updates an IpFilterRule for a Namespace.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param parameters [IpFilterRule] The Namespace IpFilterRule.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
+    #
+    def create_or_update_ip_filter_rule_with_http_info(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:nil)
+      create_or_update_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:custom_headers).value!
+    end
+
+    #
+    # Creates or updates an IpFilterRule for a Namespace.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param parameters [IpFilterRule] The Namespace IpFilterRule.
+    # @param [Hash{String => String}] A hash of custom headers that will be added
+    # to the HTTP request.
+    #
+    # @return [Concurrent::Promise] Promise object which holds the HTTP response.
+    #
+    def create_or_update_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
+      fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
+      fail ArgumentError, 'ip_filter_rule_name is nil' if ip_filter_rule_name.nil?
+      fail ArgumentError, "'ip_filter_rule_name' should satisfy the constraint - 'MinLength': '1'" if !ip_filter_rule_name.nil? && ip_filter_rule_name.length < 1
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
+      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+
+
+      request_headers = {}
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+
+      # Serialize Request
+      request_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRule.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}/ipfilterrules/{ipFilterRuleName}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'ipFilterRuleName' => ip_filter_rule_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {}),
+          base_url: request_url
+      }
+      promise = @client.make_request_async(:put, path_template, options)
+
+      promise = promise.then do |result|
+        http_response = result.response
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 200
+          error_model = JSON.load(response_content)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
+        end
+
+        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRule.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
+
+    #
+    # Deletes an IpFilterRule for a Namespace.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    #
+    def delete_ip_filter_rule(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+      response = delete_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
+      nil
+    end
+
+    #
+    # Deletes an IpFilterRule for a Namespace.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule 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 delete_ip_filter_rule_with_http_info(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+      delete_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
+    end
+
+    #
+    # Deletes an IpFilterRule for a Namespace.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule 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 delete_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
+      fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
+      fail ArgumentError, 'ip_filter_rule_name is nil' if ip_filter_rule_name.nil?
+      fail ArgumentError, "'ip_filter_rule_name' should satisfy the constraint - 'MinLength': '1'" if !ip_filter_rule_name.nil? && ip_filter_rule_name.length < 1
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
+      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+
+
+      request_headers = {}
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'ipFilterRuleName' => ip_filter_rule_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {}),
+          base_url: request_url
+      }
+      promise = @client.make_request_async(:delete, path_template, options)
+
+      promise = promise.then do |result|
+        http_response = result.response
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 200 || status_code == 204
+          error_model = JSON.load(response_content)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
+        end
+
+        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+
+        result
+      end
+
+      promise.execute
+    end
+
+    #
+    # Gets an IpFilterRule for a Namespace by rule name.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [IpFilterRule] operation results.
+    #
+    def get_ip_filter_rule(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+      response = get_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
+      response.body unless response.nil?
+    end
+
+    #
+    # Gets an IpFilterRule for a Namespace by rule name.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule 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 get_ip_filter_rule_with_http_info(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+      get_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
+    end
+
+    #
+    # Gets an IpFilterRule for a Namespace by rule name.
+    #
+    # @param resource_group_name [String] Name of the resource group within the
+    # azure subscription.
+    # @param namespace_name [String] The Namespace name
+    # @param ip_filter_rule_name [String] The IP Filter Rule 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 get_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
+      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
+      fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
+      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
+      fail ArgumentError, 'ip_filter_rule_name is nil' if ip_filter_rule_name.nil?
+      fail ArgumentError, "'ip_filter_rule_name' should satisfy the constraint - 'MinLength': '1'" if !ip_filter_rule_name.nil? && ip_filter_rule_name.length < 1
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
+      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+
+
+      request_headers = {}
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'ipFilterRuleName' => ip_filter_rule_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {}),
+          base_url: request_url
+      }
+      promise = @client.make_request_async(:get, path_template, options)
+
+      promise = promise.then do |result|
+        http_response = result.response
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 200
+          error_model = JSON.load(response_content)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
+        end
+
+        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRule.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 the available Namespaces within a subscription, irrespective of the
     # resource groups.
@@ -92,6 +511,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -113,7 +534,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Lists the available Namespaces within a resource group.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -128,7 +549,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Lists the available Namespaces within a resource group.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
@@ -142,7 +563,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Lists the available Namespaces within a resource group.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
@@ -185,6 +606,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -207,7 +630,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for creating a namespace resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -222,7 +645,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
 
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for creating a namespace resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -254,7 +677,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # resources under the namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -266,7 +689,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
 
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -294,7 +717,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Gets the description of the specified namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -310,7 +733,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Gets the description of the specified namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -325,7 +748,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Gets the description of the specified namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -372,6 +795,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -404,7 +829,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for updating a namespace resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -422,7 +847,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for updating a namespace resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -439,7 +864,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for updating a namespace resource.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -489,14 +914,16 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 201 || status_code == 200 || status_code == 202
+        unless status_code == 200 || status_code == 201 || status_code == 202
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
-        if status_code == 201
+        if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::EHNamespace.mapper()
@@ -506,7 +933,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
           end
         end
         # Deserialize Response
-        if status_code == 200
+        if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::EHNamespace.mapper()
@@ -523,48 +950,48 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Gets a list of VirtualNetwork rules for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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<IpFilterRule>] operation results.
+    # @return [Array<VirtualNetworkRule>] operation results.
     #
-    def list_ipfilter_rules(resource_group_name, namespace_name, custom_headers:nil)
-      first_page = list_ipfilter_rules_as_lazy(resource_group_name, namespace_name, custom_headers:custom_headers)
+    def list_virtual_network_rules(resource_group_name, namespace_name, custom_headers:nil)
+      first_page = list_virtual_network_rules_as_lazy(resource_group_name, namespace_name, custom_headers:custom_headers)
       first_page.get_all_items
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Gets a list of VirtualNetwork rules for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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_ipfilter_rules_with_http_info(resource_group_name, namespace_name, custom_headers:nil)
-      list_ipfilter_rules_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
+    def list_virtual_network_rules_with_http_info(resource_group_name, namespace_name, custom_headers:nil)
+      list_virtual_network_rules_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Gets a list of VirtualNetwork rules for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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_ipfilter_rules_async(resource_group_name, namespace_name, custom_headers:nil)
+    def list_virtual_network_rules_async(resource_group_name, namespace_name, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
@@ -581,7 +1008,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules'
 
       request_url = @base_url || @client.base_url
 
@@ -604,126 +1031,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRuleListResult.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
-
-    #
-    # Creates or updates an IpFilterRule for a Namespace.
-    #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
-    # @param parameters [IpFilterRule] The Namespace IpFilterRule.
-    # @param custom_headers [Hash{String => String}] A hash of custom headers that
-    # will be added to the HTTP request.
-    #
-    # @return [IpFilterRule] operation results.
-    #
-    def create_or_update_ip_filter_rule(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:nil)
-      response = create_or_update_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:custom_headers).value!
-      response.body unless response.nil?
-    end
-
-    #
-    # Creates or updates an IpFilterRule for a Namespace.
-    #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
-    # @param parameters [IpFilterRule] The Namespace IpFilterRule.
-    # @param custom_headers [Hash{String => String}] A hash of custom headers that
-    # will be added to the HTTP request.
-    #
-    # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
-    #
-    def create_or_update_ip_filter_rule_with_http_info(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:nil)
-      create_or_update_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:custom_headers).value!
-    end
-
-    #
-    # Creates or updates an IpFilterRule for a Namespace.
-    #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
-    # @param parameters [IpFilterRule] The Namespace IpFilterRule.
-    # @param [Hash{String => String}] A hash of custom headers that will be added
-    # to the HTTP request.
-    #
-    # @return [Concurrent::Promise] Promise object which holds the HTTP response.
-    #
-    def create_or_update_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, parameters, custom_headers:nil)
-      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
-      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
-      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
-      fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
-      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
-      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
-      fail ArgumentError, 'ip_filter_rule_name is nil' if ip_filter_rule_name.nil?
-      fail ArgumentError, "'ip_filter_rule_name' should satisfy the constraint - 'MinLength': '1'" if !ip_filter_rule_name.nil? && ip_filter_rule_name.length < 1
-      fail ArgumentError, 'parameters is nil' if parameters.nil?
-      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
-      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-
-
-      request_headers = {}
-      request_headers['Content-Type'] = 'application/json; charset=utf-8'
-
-      # Set Headers
-      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-
-      # Serialize Request
-      request_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRule.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}/ipfilterrules/{ipFilterRuleName}'
-
-      request_url = @base_url || @client.base_url
-
-      options = {
-          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'ipFilterRuleName' => ip_filter_rule_name,'subscriptionId' => @client.subscription_id},
-          query_params: {'api-version' => @client.api_version},
-          body: request_content,
-          headers: request_headers.merge(custom_headers || {}),
-          base_url: request_url
-      }
-      promise = @client.make_request_async(:put, path_template, options)
-
-      promise = promise.then do |result|
-        http_response = result.response
-        status_code = http_response.status
-        response_content = http_response.body
-        unless status_code == 200
-          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::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRule.mapper()
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::VirtualNetworkRuleListResult.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)
@@ -737,154 +1051,65 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Deletes an IpFilterRule for a Namespace.
-    #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
-    # @param custom_headers [Hash{String => String}] A hash of custom headers that
-    # will be added to the HTTP request.
-    #
-    #
-    def delete_ip_filter_rule(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
-      response = delete_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
-      nil
-    end
-
-    #
-    # Deletes an IpFilterRule for a Namespace.
-    #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule 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 delete_ip_filter_rule_with_http_info(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
-      delete_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
-    end
-
-    #
-    # Deletes an IpFilterRule for a Namespace.
-    #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule 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 delete_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
-      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
-      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
-      fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
-      fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
-      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
-      fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
-      fail ArgumentError, 'ip_filter_rule_name is nil' if ip_filter_rule_name.nil?
-      fail ArgumentError, "'ip_filter_rule_name' should satisfy the constraint - 'MinLength': '1'" if !ip_filter_rule_name.nil? && ip_filter_rule_name.length < 1
-      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
-      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-
-
-      request_headers = {}
-      request_headers['Content-Type'] = 'application/json; charset=utf-8'
-
-      # Set Headers
-      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}'
-
-      request_url = @base_url || @client.base_url
-
-      options = {
-          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'ipFilterRuleName' => ip_filter_rule_name,'subscriptionId' => @client.subscription_id},
-          query_params: {'api-version' => @client.api_version},
-          headers: request_headers.merge(custom_headers || {}),
-          base_url: request_url
-      }
-      promise = @client.make_request_async(:delete, path_template, options)
-
-      promise = promise.then do |result|
-        http_response = result.response
-        status_code = http_response.status
-        response_content = http_response.body
-        unless status_code == 204 || status_code == 200
-          error_model = JSON.load(response_content)
-          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
-        end
-
-        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
-
-        result
-      end
-
-      promise.execute
-    end
-
-    #
-    # Gets an IpFilterRule for a Namespace by rule name.
+    # Creates or updates an VirtualNetworkRule for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
+    # @param parameters [VirtualNetworkRule] The Namespace VirtualNetworkRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [IpFilterRule] operation results.
+    # @return [VirtualNetworkRule] operation results.
     #
-    def get_ip_filter_rule(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
-      response = get_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
+    def create_or_update_virtual_network_rule(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:nil)
+      response = create_or_update_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Gets an IpFilterRule for a Namespace by rule name.
+    # Creates or updates an VirtualNetworkRule for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
+    # @param parameters [VirtualNetworkRule] The Namespace VirtualNetworkRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_ip_filter_rule_with_http_info(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
-      get_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:custom_headers).value!
+    def create_or_update_virtual_network_rule_with_http_info(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:nil)
+      create_or_update_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:custom_headers).value!
     end
 
     #
-    # Gets an IpFilterRule for a Namespace by rule name.
+    # Creates or updates an VirtualNetworkRule for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param ip_filter_rule_name [String] The IP Filter Rule name.
+    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
+    # @param parameters [VirtualNetworkRule] The Namespace VirtualNetworkRule.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_ip_filter_rule_async(resource_group_name, namespace_name, ip_filter_rule_name, custom_headers:nil)
+    def create_or_update_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
       fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
-      fail ArgumentError, 'ip_filter_rule_name is nil' if ip_filter_rule_name.nil?
-      fail ArgumentError, "'ip_filter_rule_name' should satisfy the constraint - 'MinLength': '1'" if !ip_filter_rule_name.nil? && ip_filter_rule_name.length < 1
+      fail ArgumentError, 'virtual_network_rule_name is nil' if virtual_network_rule_name.nil?
+      fail ArgumentError, "'virtual_network_rule_name' should satisfy the constraint - 'MinLength': '1'" if !virtual_network_rule_name.nil? && virtual_network_rule_name.length < 1
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
 
 
       request_headers = {}
@@ -893,18 +1118,25 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}'
+
+      # Serialize Request
+      request_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::VirtualNetworkRule.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}/virtualnetworkrules/{virtualNetworkRuleName}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'ipFilterRuleName' => ip_filter_rule_name,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'virtualNetworkRuleName' => virtual_network_rule_name,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
+          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:get, path_template, options)
+      promise = @client.make_request_async(:put, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
@@ -916,11 +1148,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRule.mapper()
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::VirtualNetworkRule.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)
@@ -934,54 +1168,58 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Gets a list of VirtualNetwork rules for a Namespace.
+    # Deletes an VirtualNetworkRule for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
+    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [Array<IpFilterRule>] operation results.
     #
-    def list_virtual_network_rules(resource_group_name, namespace_name, custom_headers:nil)
-      first_page = list_virtual_network_rules_as_lazy(resource_group_name, namespace_name, custom_headers:custom_headers)
-      first_page.get_all_items
+    def delete_virtual_network_rule(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
+      response = delete_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
+      nil
     end
 
     #
-    # Gets a list of VirtualNetwork rules for a Namespace.
+    # Deletes an VirtualNetworkRule for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
+    # @param virtual_network_rule_name [String] The Virtual Network Rule 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_virtual_network_rules_with_http_info(resource_group_name, namespace_name, custom_headers:nil)
-      list_virtual_network_rules_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
+    def delete_virtual_network_rule_with_http_info(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
+      delete_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
     end
 
     #
-    # Gets a list of VirtualNetwork rules for a Namespace.
+    # Deletes an VirtualNetworkRule for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
+    # @param virtual_network_rule_name [String] The Virtual Network Rule 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_virtual_network_rules_async(resource_group_name, namespace_name, custom_headers:nil)
+    def delete_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
       fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
+      fail ArgumentError, 'virtual_network_rule_name is nil' if virtual_network_rule_name.nil?
+      fail ArgumentError, "'virtual_network_rule_name' should satisfy the constraint - 'MinLength': '1'" if !virtual_network_rule_name.nil? && virtual_network_rule_name.length < 1
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -992,39 +1230,31 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules/{virtualNetworkRuleName}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'virtualNetworkRuleName' => virtual_network_rule_name,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:get, path_template, options)
+      promise = @client.make_request_async(:delete, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 200
+        unless status_code == 200 || status_code == 204
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
-        # Deserialize Response
-        if status_code == 200
-          begin
-            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::VirtualNetworkRuleListResult.mapper()
-            result.body = @client.deserialize(result_mapper, parsed_response)
-          rescue Exception => e
-            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
-          end
-        end
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -1033,54 +1263,51 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Creates or updates an VirtualNetworkRule for a Namespace.
+    # Gets an VirtualNetworkRule for a Namespace by rule name.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param virtual_network_rule_name [String] The Virtual Network Rule name.
-    # @param parameters [VirtualNetworkRule] The Namespace VirtualNetworkRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [VirtualNetworkRule] operation results.
     #
-    def create_or_update_virtual_network_rule(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:nil)
-      response = create_or_update_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:custom_headers).value!
+    def get_virtual_network_rule(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
+      response = get_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Creates or updates an VirtualNetworkRule for a Namespace.
+    # Gets an VirtualNetworkRule for a Namespace by rule name.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param virtual_network_rule_name [String] The Virtual Network Rule name.
-    # @param parameters [VirtualNetworkRule] The Namespace VirtualNetworkRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def create_or_update_virtual_network_rule_with_http_info(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:nil)
-      create_or_update_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:custom_headers).value!
+    def get_virtual_network_rule_with_http_info(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
+      get_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
     end
 
     #
-    # Creates or updates an VirtualNetworkRule for a Namespace.
+    # Gets an VirtualNetworkRule for a Namespace by rule name.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param virtual_network_rule_name [String] The Virtual Network Rule name.
-    # @param parameters [VirtualNetworkRule] The Namespace VirtualNetworkRule.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def create_or_update_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, parameters, custom_headers:nil)
+    def get_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
@@ -1089,7 +1316,6 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
       fail ArgumentError, 'virtual_network_rule_name is nil' if virtual_network_rule_name.nil?
       fail ArgumentError, "'virtual_network_rule_name' should satisfy the constraint - 'MinLength': '1'" if !virtual_network_rule_name.nil? && virtual_network_rule_name.length < 1
-      fail ArgumentError, 'parameters is nil' if parameters.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1100,12 +1326,6 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-
-      # Serialize Request
-      request_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::VirtualNetworkRule.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}/virtualnetworkrules/{virtualNetworkRuleName}'
 
       request_url = @base_url || @client.base_url
@@ -1114,11 +1334,10 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
           path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'virtualNetworkRuleName' => virtual_network_rule_name,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
-          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:put, path_template, options)
+      promise = @client.make_request_async(:get, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
@@ -1130,6 +1349,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1148,60 +1369,60 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Deletes an VirtualNetworkRule for a Namespace.
+    # Create or update NetworkRuleSet for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
+    # @param parameters [NetworkRuleSet] The Namespace IpFilterRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
+    # @return [NetworkRuleSet] operation results.
     #
-    def delete_virtual_network_rule(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
-      response = delete_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
-      nil
+    def create_or_update_network_rule_set(resource_group_name, namespace_name, parameters, custom_headers:nil)
+      response = create_or_update_network_rule_set_async(resource_group_name, namespace_name, parameters, custom_headers:custom_headers).value!
+      response.body unless response.nil?
     end
 
     #
-    # Deletes an VirtualNetworkRule for a Namespace.
+    # Create or update NetworkRuleSet for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
+    # @param parameters [NetworkRuleSet] The Namespace IpFilterRule.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def delete_virtual_network_rule_with_http_info(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
-      delete_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
+    def create_or_update_network_rule_set_with_http_info(resource_group_name, namespace_name, parameters, custom_headers:nil)
+      create_or_update_network_rule_set_async(resource_group_name, namespace_name, parameters, custom_headers:custom_headers).value!
     end
 
     #
-    # Deletes an VirtualNetworkRule for a Namespace.
+    # Create or update NetworkRuleSet for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
+    # @param parameters [NetworkRuleSet] The Namespace IpFilterRule.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def delete_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
+    def create_or_update_network_rule_set_async(resource_group_name, namespace_name, parameters, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
       fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
-      fail ArgumentError, 'virtual_network_rule_name is nil' if virtual_network_rule_name.nil?
-      fail ArgumentError, "'virtual_network_rule_name' should satisfy the constraint - 'MinLength': '1'" if !virtual_network_rule_name.nil? && virtual_network_rule_name.length < 1
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
 
 
       request_headers = {}
@@ -1210,29 +1431,48 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules/{virtualNetworkRuleName}'
+
+      # Serialize Request
+      request_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::NetworkRuleSet.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}/networkRuleSets/default'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'virtualNetworkRuleName' => virtual_network_rule_name,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
+          body: request_content,
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
-      promise = @client.make_request_async(:delete, path_template, options)
+      promise = @client.make_request_async(:put, path_template, options)
 
       promise = promise.then do |result|
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 204 || status_code == 200
+        unless status_code == 200
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+        # Deserialize Response
+        if status_code == 200
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::NetworkRuleSet.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
@@ -1241,59 +1481,54 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Gets an VirtualNetworkRule for a Namespace by rule name.
+    # Gets NetworkRuleSet for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param virtual_network_rule_name [String] The Virtual Network Rule name.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [VirtualNetworkRule] operation results.
+    # @return [NetworkRuleSet] operation results.
     #
-    def get_virtual_network_rule(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
-      response = get_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
+    def get_network_rule_set(resource_group_name, namespace_name, custom_headers:nil)
+      response = get_network_rule_set_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Gets an VirtualNetworkRule for a Namespace by rule name.
+    # Gets NetworkRuleSet for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param virtual_network_rule_name [String] The Virtual Network Rule 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 get_virtual_network_rule_with_http_info(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
-      get_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:custom_headers).value!
+    def get_network_rule_set_with_http_info(resource_group_name, namespace_name, custom_headers:nil)
+      get_network_rule_set_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
     end
 
     #
-    # Gets an VirtualNetworkRule for a Namespace by rule name.
+    # Gets NetworkRuleSet for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
-    # @param virtual_network_rule_name [String] The Virtual Network Rule 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 get_virtual_network_rule_async(resource_group_name, namespace_name, virtual_network_rule_name, custom_headers:nil)
+    def get_network_rule_set_async(resource_group_name, namespace_name, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MaxLength': '90'" if !resource_group_name.nil? && resource_group_name.length > 90
       fail ArgumentError, "'resource_group_name' should satisfy the constraint - 'MinLength': '1'" if !resource_group_name.nil? && resource_group_name.length < 1
       fail ArgumentError, 'namespace_name is nil' if namespace_name.nil?
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MaxLength': '50'" if !namespace_name.nil? && namespace_name.length > 50
       fail ArgumentError, "'namespace_name' should satisfy the constraint - 'MinLength': '6'" if !namespace_name.nil? && namespace_name.length < 6
-      fail ArgumentError, 'virtual_network_rule_name is nil' if virtual_network_rule_name.nil?
-      fail ArgumentError, "'virtual_network_rule_name' should satisfy the constraint - 'MinLength': '1'" if !virtual_network_rule_name.nil? && virtual_network_rule_name.length < 1
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -1304,13 +1539,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules/{virtualNetworkRuleName}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSets/default'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'virtualNetworkRuleName' => virtual_network_rule_name,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'namespaceName' => namespace_name,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -1327,11 +1562,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::VirtualNetworkRule.mapper()
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::NetworkRuleSet.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)
@@ -1349,7 +1586,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for creating a namespace resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1367,7 +1604,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for creating a namespace resource.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
@@ -1384,7 +1621,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # manifest is immutable. This operation is idempotent.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # azure subscription.
     # @param namespace_name [String] The Namespace name
     # @param parameters [EHNamespace] Parameters for creating a namespace resource.
     # @param [Hash{String => String}] A hash of custom headers that will be added
@@ -1434,14 +1671,16 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 201 || status_code == 200 || status_code == 202
+        unless status_code == 200 || status_code == 201 || status_code == 202
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
-        if status_code == 201
+        if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::EHNamespace.mapper()
@@ -1451,7 +1690,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
           end
         end
         # Deserialize Response
-        if status_code == 200
+        if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::EHNamespace.mapper()
@@ -1472,7 +1711,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # resources under the namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -1488,7 +1727,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # resources under the namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -1504,7 +1743,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # resources under the namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.
@@ -1545,12 +1784,14 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         http_response = result.response
         status_code = http_response.status
         response_content = http_response.body
-        unless status_code == 204 || status_code == 200 || status_code == 202
+        unless status_code == 200 || status_code == 202 || status_code == 204
           error_model = JSON.load(response_content)
           fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -1559,24 +1800,22 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Lists all the available Namespaces within a subscription, irrespective of the
-    # resource groups.
+    # Gets a list of IP Filter rules for a Namespace.
     #
     # @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 [EHNamespaceListResult] operation results.
+    # @return [IpFilterRuleListResult] operation results.
     #
-    def list_next(next_page_link, custom_headers:nil)
-      response = list_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_ipfilter_rules_next(next_page_link, custom_headers:nil)
+      response = list_ipfilter_rules_next_async(next_page_link, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Lists all the available Namespaces within a subscription, irrespective of the
-    # resource groups.
+    # Gets a list of IP Filter rules for a Namespace.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1585,13 +1824,12 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @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:custom_headers).value!
+    def list_ipfilter_rules_next_with_http_info(next_page_link, custom_headers:nil)
+      list_ipfilter_rules_next_async(next_page_link, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists all the available Namespaces within a subscription, irrespective of the
-    # resource groups.
+    # Gets a list of IP Filter rules for a Namespace.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1600,7 +1838,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_next_async(next_page_link, custom_headers:nil)
+    def list_ipfilter_rules_next_async(next_page_link, custom_headers:nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -1632,11 +1870,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::EHNamespaceListResult.mapper()
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRuleListResult.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)
@@ -1650,7 +1890,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Lists the available Namespaces within a resource group.
+    # Lists all the available Namespaces within a subscription, irrespective of the
+    # resource groups.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1659,13 +1900,14 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @return [EHNamespaceListResult] operation results.
     #
-    def list_by_resource_group_next(next_page_link, custom_headers:nil)
-      response = list_by_resource_group_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_next(next_page_link, custom_headers:nil)
+      response = list_next_async(next_page_link, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Lists the available Namespaces within a resource group.
+    # Lists all the available Namespaces within a subscription, irrespective of the
+    # resource groups.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1674,12 +1916,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_resource_group_next_with_http_info(next_page_link, custom_headers:nil)
-      list_by_resource_group_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_next_with_http_info(next_page_link, custom_headers:nil)
+      list_next_async(next_page_link, custom_headers:custom_headers).value!
     end
 
     #
-    # Lists the available Namespaces within a resource group.
+    # Lists all the available Namespaces within a subscription, irrespective of the
+    # resource groups.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1688,7 +1931,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_resource_group_next_async(next_page_link, custom_headers:nil)
+    def list_next_async(next_page_link, custom_headers:nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -1720,6 +1963,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1738,22 +1983,22 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Lists the available Namespaces within a resource group.
     #
     # @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 [IpFilterRuleListResult] operation results.
+    # @return [EHNamespaceListResult] operation results.
     #
-    def list_ipfilter_rules_next(next_page_link, custom_headers:nil)
-      response = list_ipfilter_rules_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_resource_group_next(next_page_link, custom_headers:nil)
+      response = list_by_resource_group_next_async(next_page_link, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Lists the available Namespaces within a resource group.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1762,12 +2007,12 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_ipfilter_rules_next_with_http_info(next_page_link, custom_headers:nil)
-      list_ipfilter_rules_next_async(next_page_link, custom_headers:custom_headers).value!
+    def list_by_resource_group_next_with_http_info(next_page_link, custom_headers:nil)
+      list_by_resource_group_next_async(next_page_link, custom_headers:custom_headers).value!
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Lists the available Namespaces within a resource group.
     #
     # @param next_page_link [String] The NextLink from the previous successful call
     # to List operation.
@@ -1776,7 +2021,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_ipfilter_rules_next_async(next_page_link, custom_headers:nil)
+    def list_by_resource_group_next_async(next_page_link, custom_headers:nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
 
 
@@ -1808,11 +2053,13 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::IpFilterRuleListResult.mapper()
+            result_mapper = Azure::EventHub::Mgmt::V2018_01_01_preview::Models::EHNamespaceListResult.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)
@@ -1896,6 +2143,8 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1914,66 +2163,66 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     end
 
     #
-    # Lists all the available Namespaces within a subscription, irrespective of the
-    # resource groups.
+    # Gets a list of IP Filter rules for a Namespace.
     #
+    # @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 [EHNamespaceListResult] which provide lazy access to pages of the
+    # @return [IpFilterRuleListResult] which provide lazy access to pages of the
     # response.
     #
-    def list_as_lazy(custom_headers:nil)
-      response = list_async(custom_headers:custom_headers).value!
+    def list_ipfilter_rules_as_lazy(resource_group_name, namespace_name, custom_headers:nil)
+      response = list_ipfilter_rules_async(resource_group_name, namespace_name, custom_headers: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:custom_headers)
+          list_ipfilter_rules_next_async(next_page_link, custom_headers:custom_headers)
         end
         page
       end
     end
 
     #
-    # Lists the available Namespaces within a resource group.
+    # Lists all the available Namespaces within a subscription, irrespective of the
+    # resource groups.
     #
-    # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [EHNamespaceListResult] which provide lazy access to pages of the
     # response.
     #
-    def list_by_resource_group_as_lazy(resource_group_name, custom_headers:nil)
-      response = list_by_resource_group_async(resource_group_name, custom_headers:custom_headers).value!
+    def list_as_lazy(custom_headers:nil)
+      response = list_async(custom_headers:custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_by_resource_group_next_async(next_page_link, custom_headers:custom_headers)
+          list_next_async(next_page_link, custom_headers:custom_headers)
         end
         page
       end
     end
 
     #
-    # Gets a list of IP Filter rules for a Namespace.
+    # Lists the available Namespaces within a resource group.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
-    # @param namespace_name [String] The Namespace name
+    # azure subscription.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
-    # @return [IpFilterRuleListResult] which provide lazy access to pages of the
+    # @return [EHNamespaceListResult] which provide lazy access to pages of the
     # response.
     #
-    def list_ipfilter_rules_as_lazy(resource_group_name, namespace_name, custom_headers:nil)
-      response = list_ipfilter_rules_async(resource_group_name, namespace_name, custom_headers:custom_headers).value!
+    def list_by_resource_group_as_lazy(resource_group_name, custom_headers:nil)
+      response = list_by_resource_group_async(resource_group_name, custom_headers:custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|
-          list_ipfilter_rules_next_async(next_page_link, custom_headers:custom_headers)
+          list_by_resource_group_next_async(next_page_link, custom_headers:custom_headers)
         end
         page
       end
@@ -1983,7 +2232,7 @@ module Azure::EventHub::Mgmt::V2018_01_01_preview
     # Gets a list of VirtualNetwork rules for a Namespace.
     #
     # @param resource_group_name [String] Name of the resource group within the
-    # Azure subscription.
+    # 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.