diff --git a/sdk/eventhubs/mgmt-v2017_04_01/pom.xml b/sdk/eventhubs/mgmt-v2017_04_01/pom.xml
index 4cb97ac55ad12..6fbfcfc5c8c3a 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/pom.xml
+++ b/sdk/eventhubs/mgmt-v2017_04_01/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-eventhubs</artifactId>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/Namespaces.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/Namespaces.java
index 95de862b638fb..0f88ea90c5b00 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/Namespaces.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/Namespaces.java
@@ -19,6 +19,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.NamespaceAuthorizationRule;
 import rx.Completable;
+import com.microsoft.azure.management.eventhubs.v2017_04_01.NetworkRuleSet;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.NetworkRuleSetInner;
 
 /**
@@ -106,6 +107,16 @@ public interface Namespaces extends SupportsCreating<EHNamespace.DefinitionStage
      */
     Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters);
 
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkRuleSet> listNetworkRuleSetsAsync(final String resourceGroupName, final String namespaceName);
+
     /**
      * Create or update NetworkRuleSet for a Namespace.
      *
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/NetworkRuleSet.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/NetworkRuleSet.java
index 5c369bab42b5f..9a54d323ccab6 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/NetworkRuleSet.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/NetworkRuleSet.java
@@ -9,9 +9,9 @@
 package com.microsoft.azure.management.eventhubs.v2017_04_01;
 
 import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.NetworkRuleSetInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.EventHubsManager;
-import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.NetworkRuleSetInner;
 import java.util.List;
 
 /**
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/ConsumerGroupsImpl.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/ConsumerGroupsImpl.java
index dd9e9c5849d7d..47375a1be0882 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/ConsumerGroupsImpl.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/ConsumerGroupsImpl.java
@@ -64,10 +64,14 @@ public ConsumerGroup call(ConsumerGroupInner inner) {
     public Observable<ConsumerGroup> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
         ConsumerGroupsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName)
-        .map(new Func1<ConsumerGroupInner, ConsumerGroup>() {
+        .flatMap(new Func1<ConsumerGroupInner, Observable<ConsumerGroup>>() {
             @Override
-            public ConsumerGroup call(ConsumerGroupInner inner) {
-                return wrapModel(inner);
+            public Observable<ConsumerGroup> call(ConsumerGroupInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ConsumerGroup)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java
index ade19f09c14ab..418df6666c285 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java
@@ -91,10 +91,14 @@ public ArmDisasterRecovery call(ArmDisasterRecoveryInner inner) {
     public Observable<ArmDisasterRecovery> getAsync(String resourceGroupName, String namespaceName, String alias) {
         DisasterRecoveryConfigsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, alias)
-        .map(new Func1<ArmDisasterRecoveryInner, ArmDisasterRecovery>() {
+        .flatMap(new Func1<ArmDisasterRecoveryInner, Observable<ArmDisasterRecovery>>() {
             @Override
-            public ArmDisasterRecovery call(ArmDisasterRecoveryInner inner) {
-                return wrapModel(inner);
+            public Observable<ArmDisasterRecovery> call(ArmDisasterRecoveryInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ArmDisasterRecovery)wrapModel(inner));
+                }
             }
        });
     }
@@ -122,10 +126,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingDisaste
     public Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
         DisasterRecoveryConfigsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, alias, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, DisasterRecoveryConfigNamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<DisasterRecoveryConfigNamespaceAuthorizationRule>>() {
             @Override
-            public DisasterRecoveryConfigNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(inner);
+            public Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DisasterRecoveryConfigNamespaceAuthorizationRule)wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsImpl.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsImpl.java
index 0e04e4e867428..2399469cd90d9 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsImpl.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsImpl.java
@@ -67,10 +67,14 @@ public Eventhub call(EventhubInner inner) {
     public Observable<Eventhub> getAsync(String resourceGroupName, String namespaceName, String eventHubName) {
         EventHubsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, eventHubName)
-        .map(new Func1<EventhubInner, Eventhub>() {
+        .flatMap(new Func1<EventhubInner, Observable<Eventhub>>() {
             @Override
-            public Eventhub call(EventhubInner inner) {
-                return wrapModel(inner);
+            public Observable<Eventhub> call(EventhubInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Eventhub)wrapModel(inner));
+                }
             }
        });
     }
@@ -107,10 +111,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingEventHu
     public Observable<EventhubNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
         EventHubsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, EventhubNamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<EventhubNamespaceAuthorizationRule>>() {
             @Override
-            public EventhubNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapEventhubNamespaceAuthorizationRuleModel(inner);
+            public Observable<EventhubNamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((EventhubNamespaceAuthorizationRule)wrapEventhubNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsInner.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsInner.java
index 0ab251bb33f32..779505c5e3504 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsInner.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/EventHubsInner.java
@@ -784,7 +784,7 @@ private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRules
     }
 
     /**
-     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     * Creates or updates an AuthorizationRule for the specified Event Hub. Creation/update of the AuthorizationRule will take a few seconds to take effect.
      *
      * @param resourceGroupName Name of the resource group within the azure subscription.
      * @param namespaceName The Namespace name
@@ -801,7 +801,7 @@ public AuthorizationRuleInner createOrUpdateAuthorizationRule(String resourceGro
     }
 
     /**
-     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     * Creates or updates an AuthorizationRule for the specified Event Hub. Creation/update of the AuthorizationRule will take a few seconds to take effect.
      *
      * @param resourceGroupName Name of the resource group within the azure subscription.
      * @param namespaceName The Namespace name
@@ -817,7 +817,7 @@ public ServiceFuture<AuthorizationRuleInner> createOrUpdateAuthorizationRuleAsyn
     }
 
     /**
-     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     * Creates or updates an AuthorizationRule for the specified Event Hub. Creation/update of the AuthorizationRule will take a few seconds to take effect.
      *
      * @param resourceGroupName Name of the resource group within the azure subscription.
      * @param namespaceName The Namespace name
@@ -837,7 +837,7 @@ public AuthorizationRuleInner call(ServiceResponse<AuthorizationRuleInner> respo
     }
 
     /**
-     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     * Creates or updates an AuthorizationRule for the specified Event Hub. Creation/update of the AuthorizationRule will take a few seconds to take effect.
      *
      * @param resourceGroupName Name of the resource group within the azure subscription.
      * @param namespaceName The Namespace name
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesImpl.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesImpl.java
index 41b163351847f..3146fa5f8f19b 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesImpl.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesImpl.java
@@ -178,6 +178,10 @@ private NamespaceAuthorizationRuleImpl wrapNamespaceAuthorizationRuleModel(Autho
         return  new NamespaceAuthorizationRuleImpl(inner, manager());
     }
 
+    private NetworkRuleSetImpl wrapNetworkRuleSetModel(NetworkRuleSetInner inner) {
+        return  new NetworkRuleSetImpl(inner, manager());
+    }
+
     private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingNamespacesInnerAsync(String id) {
         String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
         String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
@@ -190,10 +194,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingNamespa
     public Observable<NamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
         NamespacesInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, NamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<NamespaceAuthorizationRule>>() {
             @Override
-            public NamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapNamespaceAuthorizationRuleModel(inner);
+            public Observable<NamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NamespaceAuthorizationRule)wrapNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }
@@ -246,6 +254,24 @@ public AccessKeys call(AccessKeysInner inner) {
         });
     }
 
+    @Override
+    public Observable<NetworkRuleSet> listNetworkRuleSetsAsync(final String resourceGroupName, final String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.listNetworkRuleSetsAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<NetworkRuleSetInner>, Iterable<NetworkRuleSetInner>>() {
+            @Override
+            public Iterable<NetworkRuleSetInner> call(Page<NetworkRuleSetInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
+            @Override
+            public NetworkRuleSet call(NetworkRuleSetInner inner) {
+                return wrapNetworkRuleSetModel(inner);
+            }
+        });
+    }
+
     @Override
     public Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
         NamespacesInner client = this.inner();
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesInner.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesInner.java
index 2a656ffb6b3e9..a1dc81f975c0a 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesInner.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NamespacesInner.java
@@ -141,6 +141,10 @@ interface NamespacesService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSets/default")
         Observable<Response<ResponseBody>> getNetworkRuleSet(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhubs.v2017_04_01.Namespaces listNetworkRuleSets" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSets")
+        Observable<Response<ResponseBody>> listNetworkRuleSets(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhubs.v2017_04_01.Namespaces listNext" })
         @GET
         Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -153,6 +157,10 @@ interface NamespacesService {
         @GET
         Observable<Response<ResponseBody>> listAuthorizationRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhubs.v2017_04_01.Namespaces listNetworkRuleSetsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNetworkRuleSetsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
     }
 
     /**
@@ -1841,6 +1849,129 @@ private ServiceResponse<NetworkRuleSetInner> getNetworkRuleSetDelegate(Response<
                 .build(response);
     }
 
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;NetworkRuleSetInner&gt; object if successful.
+     */
+    public PagedList<NetworkRuleSetInner> listNetworkRuleSets(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<NetworkRuleSetInner>> response = listNetworkRuleSetsSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<NetworkRuleSetInner>(response.body()) {
+            @Override
+            public Page<NetworkRuleSetInner> nextPage(String nextPageLink) {
+                return listNetworkRuleSetsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<NetworkRuleSetInner>> listNetworkRuleSetsAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<NetworkRuleSetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNetworkRuleSetsSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkRuleSetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> call(String nextPageLink) {
+                    return listNetworkRuleSetsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkRuleSetInner&gt; object
+     */
+    public Observable<Page<NetworkRuleSetInner>> listNetworkRuleSetsAsync(final String resourceGroupName, final String namespaceName) {
+        return listNetworkRuleSetsWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<NetworkRuleSetInner>>, Page<NetworkRuleSetInner>>() {
+                @Override
+                public Page<NetworkRuleSetInner> call(ServiceResponse<Page<NetworkRuleSetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkRuleSetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> listNetworkRuleSetsWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listNetworkRuleSetsSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkRuleSetInner>>, Observable<ServiceResponse<Page<NetworkRuleSetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> call(ServiceResponse<Page<NetworkRuleSetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNetworkRuleSetsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+    ServiceResponse<PageImpl<NetworkRuleSetInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<NetworkRuleSetInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkRuleSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> listNetworkRuleSetsSinglePageAsync(final String resourceGroupName, final String namespaceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (namespaceName == null) {
+            throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listNetworkRuleSets(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkRuleSetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkRuleSetInner>> result = listNetworkRuleSetsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkRuleSetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkRuleSetInner>> listNetworkRuleSetsDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkRuleSetInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkRuleSetInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
      *
@@ -2174,4 +2305,115 @@ private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRules
                 .build(response);
     }
 
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;NetworkRuleSetInner&gt; object if successful.
+     */
+    public PagedList<NetworkRuleSetInner> listNetworkRuleSetsNext(final String nextPageLink) {
+        ServiceResponse<Page<NetworkRuleSetInner>> response = listNetworkRuleSetsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NetworkRuleSetInner>(response.body()) {
+            @Override
+            public Page<NetworkRuleSetInner> nextPage(String nextPageLink) {
+                return listNetworkRuleSetsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<NetworkRuleSetInner>> listNetworkRuleSetsNextAsync(final String nextPageLink, final ServiceFuture<List<NetworkRuleSetInner>> serviceFuture, final ListOperationCallback<NetworkRuleSetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNetworkRuleSetsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NetworkRuleSetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> call(String nextPageLink) {
+                    return listNetworkRuleSetsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkRuleSetInner&gt; object
+     */
+    public Observable<Page<NetworkRuleSetInner>> listNetworkRuleSetsNextAsync(final String nextPageLink) {
+        return listNetworkRuleSetsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NetworkRuleSetInner>>, Page<NetworkRuleSetInner>>() {
+                @Override
+                public Page<NetworkRuleSetInner> call(ServiceResponse<Page<NetworkRuleSetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NetworkRuleSetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> listNetworkRuleSetsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNetworkRuleSetsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NetworkRuleSetInner>>, Observable<ServiceResponse<Page<NetworkRuleSetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> call(ServiceResponse<Page<NetworkRuleSetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNetworkRuleSetsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+    ServiceResponse<PageImpl<NetworkRuleSetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NetworkRuleSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> listNetworkRuleSetsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNetworkRuleSetsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NetworkRuleSetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NetworkRuleSetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NetworkRuleSetInner>> result = listNetworkRuleSetsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NetworkRuleSetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NetworkRuleSetInner>> listNetworkRuleSetsNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NetworkRuleSetInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NetworkRuleSetInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
 }
diff --git a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NetworkRuleSetImpl.java b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NetworkRuleSetImpl.java
index 55553c9d4d0e1..c96f414c12a6e 100644
--- a/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NetworkRuleSetImpl.java
+++ b/sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/NetworkRuleSetImpl.java
@@ -10,6 +10,7 @@
 
 import com.microsoft.azure.management.eventhubs.v2017_04_01.NetworkRuleSet;
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.DefaultAction;
 import java.util.List;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.NWRuleSetIpRules;
@@ -17,7 +18,8 @@
 
 class NetworkRuleSetImpl extends WrapperImpl<NetworkRuleSetInner> implements NetworkRuleSet {
     private final EventHubsManager manager;
-    NetworkRuleSetImpl(NetworkRuleSetInner inner, EventHubsManager manager) {
+
+    NetworkRuleSetImpl(NetworkRuleSetInner inner,  EventHubsManager manager) {
         super(inner);
         this.manager = manager;
     }
@@ -27,6 +29,8 @@ public EventHubsManager manager() {
         return this.manager;
     }
 
+
+
     @Override
     public DefaultAction defaultAction() {
         return this.inner().defaultAction();