diff --git a/eventhub/resource-manager/v2015_08_01/pom.xml b/eventhub/resource-manager/v2015_08_01/pom.xml
new file mode 100644
index 000000000000..cae83fe2c757
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/pom.xml
@@ -0,0 +1,133 @@
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.eventhub.v2015_08_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-eventhub</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for EventHub Management</name>
+    <description>This package contains Microsoft EventHub Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/AccessRights.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/AccessRights.java
new file mode 100644
index 000000000000..80c1fc5a5b71
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/AccessRights.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for AccessRights.
+ */
+public enum AccessRights {
+    /** Enum value Manage. */
+    MANAGE("Manage"),
+
+    /** Enum value Send. */
+    SEND("Send"),
+
+    /** Enum value Listen. */
+    LISTEN("Listen");
+
+    /** The actual serialized value for a AccessRights instance. */
+    private String value;
+
+    AccessRights(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a AccessRights instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed AccessRights object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static AccessRights fromString(String value) {
+        AccessRights[] items = AccessRights.values();
+        for (AccessRights item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/CheckNameAvailabilityParameter.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/CheckNameAvailabilityParameter.java
new file mode 100644
index 000000000000..9b1db9b5a826
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/CheckNameAvailabilityParameter.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameter supplied to check Namespace name availability operation.
+ */
+public class CheckNameAvailabilityParameter {
+    /**
+     * Name to check the namespace name availability.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Get name to check the namespace name availability.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name to check the namespace name availability.
+     *
+     * @param name the name value to set
+     * @return the CheckNameAvailabilityParameter object itself.
+     */
+    public CheckNameAvailabilityParameter withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/CheckNameAvailabilityResult.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/CheckNameAvailabilityResult.java
new file mode 100644
index 000000000000..6c63a7feb46f
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/CheckNameAvailabilityResult.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.CheckNameAvailabilityResultInner;
+
+/**
+ * Type representing CheckNameAvailabilityResult.
+ */
+public interface CheckNameAvailabilityResult extends HasInner<CheckNameAvailabilityResultInner>, HasManager<EventHubManager> {
+    /**
+     * @return the message value.
+     */
+    String message();
+
+    /**
+     * @return the nameAvailable value.
+     */
+    Boolean nameAvailable();
+
+    /**
+     * @return the reason value.
+     */
+    UnavailableReason reason();
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroupCreateOrUpdateParameters.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroupCreateOrUpdateParameters.java
new file mode 100644
index 000000000000..e28aa065da7a
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroupCreateOrUpdateParameters.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters supplied to the Create Or Update Consumer Group operation.
+ */
+@JsonFlatten
+public class ConsumerGroupCreateOrUpdateParameters {
+    /**
+     * Location of the resource.
+     */
+    @JsonProperty(value = "location", required = true)
+    private String location;
+
+    /**
+     * ARM type of the Namespace.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * Name of the consumer group.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Exact time the message was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * The path of the Event Hub.
+     */
+    @JsonProperty(value = "properties.eventHubPath", access = JsonProperty.Access.WRITE_ONLY)
+    private String eventHubPath;
+
+    /**
+     * The exact time the message was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * The user metadata.
+     */
+    @JsonProperty(value = "properties.userMetadata")
+    private String userMetadata;
+
+    /**
+     * Get location of the resource.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set location of the resource.
+     *
+     * @param location the location value to set
+     * @return the ConsumerGroupCreateOrUpdateParameters object itself.
+     */
+    public ConsumerGroupCreateOrUpdateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get aRM type of the Namespace.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set aRM type of the Namespace.
+     *
+     * @param type the type value to set
+     * @return the ConsumerGroupCreateOrUpdateParameters object itself.
+     */
+    public ConsumerGroupCreateOrUpdateParameters withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get name of the consumer group.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the consumer group.
+     *
+     * @param name the name value to set
+     * @return the ConsumerGroupCreateOrUpdateParameters object itself.
+     */
+    public ConsumerGroupCreateOrUpdateParameters withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get exact time the message was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get the path of the Event Hub.
+     *
+     * @return the eventHubPath value
+     */
+    public String eventHubPath() {
+        return this.eventHubPath;
+    }
+
+    /**
+     * Get the exact time the message was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get the user metadata.
+     *
+     * @return the userMetadata value
+     */
+    public String userMetadata() {
+        return this.userMetadata;
+    }
+
+    /**
+     * Set the user metadata.
+     *
+     * @param userMetadata the userMetadata value to set
+     * @return the ConsumerGroupCreateOrUpdateParameters object itself.
+     */
+    public ConsumerGroupCreateOrUpdateParameters withUserMetadata(String userMetadata) {
+        this.userMetadata = userMetadata;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroupResource.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroupResource.java
new file mode 100644
index 000000000000..7bbe520b9175
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroupResource.java
@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.ConsumerGroupResourceInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing ConsumerGroupResource.
+ */
+public interface ConsumerGroupResource extends HasInner<ConsumerGroupResourceInner>, Indexable, Refreshable<ConsumerGroupResource>, Updatable<ConsumerGroupResource.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the eventHubPath value.
+     */
+    String eventHubPath();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * @return the userMetadata value.
+     */
+    String userMetadata();
+
+    /**
+     * The entirety of the ConsumerGroupResource definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithEventhub, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ConsumerGroupResource definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ConsumerGroupResource definition.
+         */
+        interface Blank extends WithEventhub {
+        }
+
+        /**
+         * The stage of the consumergroupresource definition allowing to specify Eventhub.
+         */
+        interface WithEventhub {
+           /**
+            * Specifies resourceGroupName, namespaceName, eventHubName.
+            */
+            WithLocation withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName);
+        }
+
+        /**
+         * The stage of the consumergroupresource definition allowing to specify Location.
+         */
+        interface WithLocation {
+           /**
+            * Specifies location.
+            */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the consumergroupresource definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the consumergroupresource definition allowing to specify Type.
+         */
+        interface WithType {
+            /**
+             * Specifies type.
+             */
+            WithCreate withType(String type);
+        }
+
+        /**
+         * The stage of the consumergroupresource definition allowing to specify UserMetadata.
+         */
+        interface WithUserMetadata {
+            /**
+             * Specifies userMetadata.
+             */
+            WithCreate withUserMetadata(String userMetadata);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<ConsumerGroupResource>, DefinitionStages.WithName, DefinitionStages.WithType, DefinitionStages.WithUserMetadata {
+        }
+    }
+    /**
+     * The template for a ConsumerGroupResource update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ConsumerGroupResource>, UpdateStages.WithName, UpdateStages.WithType, UpdateStages.WithUserMetadata {
+    }
+
+    /**
+     * Grouping of ConsumerGroupResource update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the consumergroupresource update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the consumergroupresource update allowing to specify Type.
+         */
+        interface WithType {
+            /**
+             * Specifies type.
+             */
+            Update withType(String type);
+        }
+
+        /**
+         * The stage of the consumergroupresource update allowing to specify UserMetadata.
+         */
+        interface WithUserMetadata {
+            /**
+             * Specifies userMetadata.
+             */
+            Update withUserMetadata(String userMetadata);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroups.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroups.java
new file mode 100644
index 000000000000..0c2c06ba4d98
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ConsumerGroups.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.ConsumerGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ConsumerGroups.
+ */
+public interface ConsumerGroups extends SupportsCreating<ConsumerGroupResource.DefinitionStages.Blank>, HasInner<ConsumerGroupsInner> {
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConsumerGroupResource> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName);
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConsumerGroupResource> listAllAsync(final String resourceGroupName, final String namespaceName, final String eventHubName);
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName);
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EntityStatus.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EntityStatus.java
new file mode 100644
index 000000000000..e84cac69ccbc
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EntityStatus.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for EntityStatus.
+ */
+public enum EntityStatus {
+    /** Enum value Active. */
+    ACTIVE("Active"),
+
+    /** Enum value Disabled. */
+    DISABLED("Disabled"),
+
+    /** Enum value Restoring. */
+    RESTORING("Restoring"),
+
+    /** Enum value SendDisabled. */
+    SEND_DISABLED("SendDisabled"),
+
+    /** Enum value ReceiveDisabled. */
+    RECEIVE_DISABLED("ReceiveDisabled"),
+
+    /** Enum value Creating. */
+    CREATING("Creating"),
+
+    /** Enum value Deleting. */
+    DELETING("Deleting"),
+
+    /** Enum value Renaming. */
+    RENAMING("Renaming"),
+
+    /** Enum value Unknown. */
+    UNKNOWN("Unknown");
+
+    /** The actual serialized value for a EntityStatus instance. */
+    private String value;
+
+    EntityStatus(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a EntityStatus instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed EntityStatus object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static EntityStatus fromString(String value) {
+        EntityStatus[] items = EntityStatus.values();
+        for (EntityStatus item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubCreateOrUpdateParameters.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubCreateOrUpdateParameters.java
new file mode 100644
index 000000000000..59417ff7d142
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubCreateOrUpdateParameters.java
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters supplied to the Create Or Update Event Hub operation.
+ */
+@JsonFlatten
+public class EventHubCreateOrUpdateParameters {
+    /**
+     * Location of the resource.
+     */
+    @JsonProperty(value = "location", required = true)
+    private String location;
+
+    /**
+     * ARM type of the Namespace.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * Name of the Event Hub.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Exact time the Event Hub was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * Number of days to retain the events for this Event Hub.
+     */
+    @JsonProperty(value = "properties.messageRetentionInDays")
+    private Long messageRetentionInDays;
+
+    /**
+     * Number of partitions created for the Event Hub.
+     */
+    @JsonProperty(value = "properties.partitionCount")
+    private Long partitionCount;
+
+    /**
+     * Current number of shards on the Event Hub.
+     */
+    @JsonProperty(value = "properties.partitionIds", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> partitionIds;
+
+    /**
+     * Enumerates the possible values for the status of the Event Hub. Possible
+     * values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled',
+     * 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     */
+    @JsonProperty(value = "properties.status")
+    private EntityStatus status;
+
+    /**
+     * The exact time the message was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * Get location of the resource.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set location of the resource.
+     *
+     * @param location the location value to set
+     * @return the EventHubCreateOrUpdateParameters object itself.
+     */
+    public EventHubCreateOrUpdateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get aRM type of the Namespace.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set aRM type of the Namespace.
+     *
+     * @param type the type value to set
+     * @return the EventHubCreateOrUpdateParameters object itself.
+     */
+    public EventHubCreateOrUpdateParameters withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get name of the Event Hub.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the Event Hub.
+     *
+     * @param name the name value to set
+     * @return the EventHubCreateOrUpdateParameters object itself.
+     */
+    public EventHubCreateOrUpdateParameters withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get exact time the Event Hub was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get number of days to retain the events for this Event Hub.
+     *
+     * @return the messageRetentionInDays value
+     */
+    public Long messageRetentionInDays() {
+        return this.messageRetentionInDays;
+    }
+
+    /**
+     * Set number of days to retain the events for this Event Hub.
+     *
+     * @param messageRetentionInDays the messageRetentionInDays value to set
+     * @return the EventHubCreateOrUpdateParameters object itself.
+     */
+    public EventHubCreateOrUpdateParameters withMessageRetentionInDays(Long messageRetentionInDays) {
+        this.messageRetentionInDays = messageRetentionInDays;
+        return this;
+    }
+
+    /**
+     * Get number of partitions created for the Event Hub.
+     *
+     * @return the partitionCount value
+     */
+    public Long partitionCount() {
+        return this.partitionCount;
+    }
+
+    /**
+     * Set number of partitions created for the Event Hub.
+     *
+     * @param partitionCount the partitionCount value to set
+     * @return the EventHubCreateOrUpdateParameters object itself.
+     */
+    public EventHubCreateOrUpdateParameters withPartitionCount(Long partitionCount) {
+        this.partitionCount = partitionCount;
+        return this;
+    }
+
+    /**
+     * Get current number of shards on the Event Hub.
+     *
+     * @return the partitionIds value
+     */
+    public List<String> partitionIds() {
+        return this.partitionIds;
+    }
+
+    /**
+     * Get enumerates the possible values for the status of the Event Hub. Possible values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     *
+     * @return the status value
+     */
+    public EntityStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Set enumerates the possible values for the status of the Event Hub. Possible values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     *
+     * @param status the status value to set
+     * @return the EventHubCreateOrUpdateParameters object itself.
+     */
+    public EventHubCreateOrUpdateParameters withStatus(EntityStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get the exact time the message was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubResource.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubResource.java
new file mode 100644
index 000000000000..f41cd35b9497
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubResource.java
@@ -0,0 +1,232 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubResourceInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import org.joda.time.DateTime;
+import java.util.List;
+
+/**
+ * Type representing EventHubResource.
+ */
+public interface EventHubResource extends HasInner<EventHubResourceInner>, Indexable, Refreshable<EventHubResource>, Updatable<EventHubResource.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the messageRetentionInDays value.
+     */
+    Long messageRetentionInDays();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the partitionCount value.
+     */
+    Long partitionCount();
+
+    /**
+     * @return the partitionIds value.
+     */
+    List<String> partitionIds();
+
+    /**
+     * @return the status value.
+     */
+    EntityStatus status();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * The entirety of the EventHubResource definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of EventHubResource definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a EventHubResource definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithLocation withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify Location.
+         */
+        interface WithLocation {
+           /**
+            * Specifies location.
+            */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify MessageRetentionInDays.
+         */
+        interface WithMessageRetentionInDays {
+            /**
+             * Specifies messageRetentionInDays.
+             */
+            WithCreate withMessageRetentionInDays(Long messageRetentionInDays);
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify PartitionCount.
+         */
+        interface WithPartitionCount {
+            /**
+             * Specifies partitionCount.
+             */
+            WithCreate withPartitionCount(Long partitionCount);
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify Status.
+         */
+        interface WithStatus {
+            /**
+             * Specifies status.
+             */
+            WithCreate withStatus(EntityStatus status);
+        }
+
+        /**
+         * The stage of the eventhubresource definition allowing to specify Type.
+         */
+        interface WithType {
+            /**
+             * Specifies type.
+             */
+            WithCreate withType(String type);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<EventHubResource>, DefinitionStages.WithMessageRetentionInDays, DefinitionStages.WithName, DefinitionStages.WithPartitionCount, DefinitionStages.WithStatus, DefinitionStages.WithType {
+        }
+    }
+    /**
+     * The template for a EventHubResource update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<EventHubResource>, UpdateStages.WithMessageRetentionInDays, UpdateStages.WithName, UpdateStages.WithPartitionCount, UpdateStages.WithStatus, UpdateStages.WithType {
+    }
+
+    /**
+     * Grouping of EventHubResource update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the eventhubresource update allowing to specify MessageRetentionInDays.
+         */
+        interface WithMessageRetentionInDays {
+            /**
+             * Specifies messageRetentionInDays.
+             */
+            Update withMessageRetentionInDays(Long messageRetentionInDays);
+        }
+
+        /**
+         * The stage of the eventhubresource update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            Update withName(String name);
+        }
+
+        /**
+         * The stage of the eventhubresource update allowing to specify PartitionCount.
+         */
+        interface WithPartitionCount {
+            /**
+             * Specifies partitionCount.
+             */
+            Update withPartitionCount(Long partitionCount);
+        }
+
+        /**
+         * The stage of the eventhubresource update allowing to specify Status.
+         */
+        interface WithStatus {
+            /**
+             * Specifies status.
+             */
+            Update withStatus(EntityStatus status);
+        }
+
+        /**
+         * The stage of the eventhubresource update allowing to specify Type.
+         */
+        interface WithType {
+            /**
+             * Specifies type.
+             */
+            Update withType(String type);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubs.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubs.java
new file mode 100644
index 000000000000..00e43da36023
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventHubs.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubsInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventhubNamespaceSharedAccessAuthorizationRuleResource;
+
+/**
+ * Type representing EventHubs.
+ */
+public interface EventHubs extends SupportsCreating<EventHubResource.DefinitionStages.Blank>, HasInner<EventHubsInner> {
+    /**
+     * Begins definition for a new AuthorizationRule resource.
+     * @param name resource name.
+     * @return the first stage of the new AuthorizationRule definition.
+     */
+    EventhubNamespaceSharedAccessAuthorizationRuleResource.DefinitionStages.Blank defineAuthorizationRule(String name);
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EventHubResource> getAsync(String resourceGroupName, String namespaceName, String eventHubName);
+
+    /**
+     * Gets all the Event Hubs in 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<EventHubResource> listAllAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName);
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName);
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NamespaceSharedAccessAuthorizationRuleResource> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceListKeys> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceListKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventhubNamespaceSharedAccessAuthorizationRuleResource.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventhubNamespaceSharedAccessAuthorizationRuleResource.java
new file mode 100644
index 000000000000..c97e53c9b8dd
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/EventhubNamespaceSharedAccessAuthorizationRuleResource.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.SharedAccessAuthorizationRuleResourceInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import java.util.List;
+
+/**
+ * Type representing EventhubNamespaceSharedAccessAuthorizationRuleResource.
+ */
+public interface EventhubNamespaceSharedAccessAuthorizationRuleResource extends HasInner<SharedAccessAuthorizationRuleResourceInner>, Indexable, Refreshable<EventhubNamespaceSharedAccessAuthorizationRuleResource>, Updatable<EventhubNamespaceSharedAccessAuthorizationRuleResource.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the rights value.
+     */
+    List<AccessRights> rights();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the EventhubNamespaceSharedAccessAuthorizationRuleResource definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithEventhub, DefinitionStages.WithRights, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of EventhubNamespaceSharedAccessAuthorizationRuleResource definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a EventhubNamespaceSharedAccessAuthorizationRuleResource definition.
+         */
+        interface Blank extends WithEventhub {
+        }
+
+        /**
+         * The stage of the eventhubnamespacesharedaccessauthorizationruleresource definition allowing to specify Eventhub.
+         */
+        interface WithEventhub {
+           /**
+            * Specifies resourceGroupName, namespaceName, eventHubName.
+            */
+            WithRights withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName);
+        }
+
+        /**
+         * The stage of the eventhubnamespacesharedaccessauthorizationruleresource definition allowing to specify Rights.
+         */
+        interface WithRights {
+           /**
+            * Specifies rights.
+            */
+            WithCreate withRights(List<AccessRights> rights);
+        }
+
+        /**
+         * The stage of the eventhubnamespacesharedaccessauthorizationruleresource definition allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the eventhubnamespacesharedaccessauthorizationruleresource definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<EventhubNamespaceSharedAccessAuthorizationRuleResource>, DefinitionStages.WithLocation, DefinitionStages.WithName {
+        }
+    }
+    /**
+     * The template for a EventhubNamespaceSharedAccessAuthorizationRuleResource update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<EventhubNamespaceSharedAccessAuthorizationRuleResource>, UpdateStages.WithLocation, UpdateStages.WithName {
+    }
+
+    /**
+     * Grouping of EventhubNamespaceSharedAccessAuthorizationRuleResource update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the eventhubnamespacesharedaccessauthorizationruleresource update allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             */
+            Update withLocation(String location);
+        }
+
+        /**
+         * The stage of the eventhubnamespacesharedaccessauthorizationruleresource update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            Update withName(String name);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceCreateOrUpdateParameters.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceCreateOrUpdateParameters.java
new file mode 100644
index 000000000000..13876b33ce30
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceCreateOrUpdateParameters.java
@@ -0,0 +1,272 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import java.util.Map;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters supplied to the Create Or Update Namespace operation.
+ */
+@JsonFlatten
+public class NamespaceCreateOrUpdateParameters {
+    /**
+     * Namespace location.
+     */
+    @JsonProperty(value = "location", required = true)
+    private String location;
+
+    /**
+     * The sku property.
+     */
+    @JsonProperty(value = "sku")
+    private Sku sku;
+
+    /**
+     * Namespace tags.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * State of the Namespace. Possible values include: 'Unknown', 'Creating',
+     * 'Created', 'Activating', 'Enabling', 'Active', 'Disabling', 'Disabled',
+     * 'SoftDeleting', 'SoftDeleted', 'Removing', 'Removed', 'Failed'.
+     */
+    @JsonProperty(value = "properties.status")
+    private NamespaceState status;
+
+    /**
+     * Provisioning state of the Namespace.
+     */
+    @JsonProperty(value = "properties.provisioningState")
+    private String provisioningState;
+
+    /**
+     * The time the Namespace was created.
+     */
+    @JsonProperty(value = "properties.createdAt")
+    private DateTime createdAt;
+
+    /**
+     * The time the Namespace was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt")
+    private DateTime updatedAt;
+
+    /**
+     * Endpoint you can use to perform Service Bus operations.
+     */
+    @JsonProperty(value = "properties.serviceBusEndpoint")
+    private String serviceBusEndpoint;
+
+    /**
+     * Identifier for Azure Insights metrics.
+     */
+    @JsonProperty(value = "properties.metricId", access = JsonProperty.Access.WRITE_ONLY)
+    private String metricId;
+
+    /**
+     * Specifies whether this instance is enabled.
+     */
+    @JsonProperty(value = "properties.enabled")
+    private Boolean enabled;
+
+    /**
+     * Get namespace location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set namespace location.
+     *
+     * @param location the location value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the sku value.
+     *
+     * @return the sku value
+     */
+    public Sku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the sku value.
+     *
+     * @param sku the sku value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withSku(Sku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get namespace tags.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set namespace tags.
+     *
+     * @param tags the tags value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get state of the Namespace. Possible values include: 'Unknown', 'Creating', 'Created', 'Activating', 'Enabling', 'Active', 'Disabling', 'Disabled', 'SoftDeleting', 'SoftDeleted', 'Removing', 'Removed', 'Failed'.
+     *
+     * @return the status value
+     */
+    public NamespaceState status() {
+        return this.status;
+    }
+
+    /**
+     * Set state of the Namespace. Possible values include: 'Unknown', 'Creating', 'Created', 'Activating', 'Enabling', 'Active', 'Disabling', 'Disabled', 'SoftDeleting', 'SoftDeleted', 'Removing', 'Removed', 'Failed'.
+     *
+     * @param status the status value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withStatus(NamespaceState status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get provisioning state of the Namespace.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set provisioning state of the Namespace.
+     *
+     * @param provisioningState the provisioningState value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withProvisioningState(String provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get the time the Namespace was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Set the time the Namespace was created.
+     *
+     * @param createdAt the createdAt value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withCreatedAt(DateTime createdAt) {
+        this.createdAt = createdAt;
+        return this;
+    }
+
+    /**
+     * Get the time the Namespace was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Set the time the Namespace was updated.
+     *
+     * @param updatedAt the updatedAt value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withUpdatedAt(DateTime updatedAt) {
+        this.updatedAt = updatedAt;
+        return this;
+    }
+
+    /**
+     * Get endpoint you can use to perform Service Bus operations.
+     *
+     * @return the serviceBusEndpoint value
+     */
+    public String serviceBusEndpoint() {
+        return this.serviceBusEndpoint;
+    }
+
+    /**
+     * Set endpoint you can use to perform Service Bus operations.
+     *
+     * @param serviceBusEndpoint the serviceBusEndpoint value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withServiceBusEndpoint(String serviceBusEndpoint) {
+        this.serviceBusEndpoint = serviceBusEndpoint;
+        return this;
+    }
+
+    /**
+     * Get identifier for Azure Insights metrics.
+     *
+     * @return the metricId value
+     */
+    public String metricId() {
+        return this.metricId;
+    }
+
+    /**
+     * Get specifies whether this instance is enabled.
+     *
+     * @return the enabled value
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set specifies whether this instance is enabled.
+     *
+     * @param enabled the enabled value to set
+     * @return the NamespaceCreateOrUpdateParameters object itself.
+     */
+    public NamespaceCreateOrUpdateParameters withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceResource.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceResource.java
new file mode 100644
index 000000000000..0634cdc79cfb
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceResource.java
@@ -0,0 +1,189 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
+import com.microsoft.azure.arm.resources.models.HasResourceGroup;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.NamespaceResourceInner;
+
+/**
+ * Type representing NamespaceResource.
+ */
+public interface NamespaceResource extends HasInner<NamespaceResourceInner>, Resource, GroupableResourceCore<EventHubManager, NamespaceResourceInner>, HasResourceGroup, Refreshable<NamespaceResource>, Updatable<NamespaceResource.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the enabled value.
+     */
+    Boolean enabled();
+
+    /**
+     * @return the metricId value.
+     */
+    String metricId();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the serviceBusEndpoint value.
+     */
+    String serviceBusEndpoint();
+
+    /**
+     * @return the sku value.
+     */
+    Sku sku();
+
+    /**
+     * @return the status value.
+     */
+    NamespaceState status();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * The entirety of the NamespaceResource definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NamespaceResource definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NamespaceResource definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the NamespaceResource definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify CreatedAt.
+         */
+        interface WithCreatedAt {
+            /**
+             * Specifies createdAt.
+             */
+            WithCreate withCreatedAt(DateTime createdAt);
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify Enabled.
+         */
+        interface WithEnabled {
+            /**
+             * Specifies enabled.
+             */
+            WithCreate withEnabled(Boolean enabled);
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify ProvisioningState.
+         */
+        interface WithProvisioningState {
+            /**
+             * Specifies provisioningState.
+             */
+            WithCreate withProvisioningState(String provisioningState);
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify ServiceBusEndpoint.
+         */
+        interface WithServiceBusEndpoint {
+            /**
+             * Specifies serviceBusEndpoint.
+             */
+            WithCreate withServiceBusEndpoint(String serviceBusEndpoint);
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            WithCreate withSku(Sku sku);
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify Status.
+         */
+        interface WithStatus {
+            /**
+             * Specifies status.
+             */
+            WithCreate withStatus(NamespaceState status);
+        }
+
+        /**
+         * The stage of the namespaceresource update allowing to specify UpdatedAt.
+         */
+        interface WithUpdatedAt {
+            /**
+             * Specifies updatedAt.
+             */
+            WithCreate withUpdatedAt(DateTime updatedAt);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<NamespaceResource>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithCreatedAt, DefinitionStages.WithEnabled, DefinitionStages.WithProvisioningState, DefinitionStages.WithServiceBusEndpoint, DefinitionStages.WithSku, DefinitionStages.WithStatus, DefinitionStages.WithUpdatedAt {
+        }
+    }
+    /**
+     * The template for a NamespaceResource update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NamespaceResource>, Resource.UpdateWithTags<Update>, UpdateStages.WithSku {
+    }
+
+    /**
+     * Grouping of NamespaceResource update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the namespaceresource {0} allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            Update withSku(Sku sku);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceSharedAccessAuthorizationRuleResource.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceSharedAccessAuthorizationRuleResource.java
new file mode 100644
index 000000000000..80c2a2318f6b
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceSharedAccessAuthorizationRuleResource.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.SharedAccessAuthorizationRuleResourceInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import java.util.List;
+
+/**
+ * Type representing NamespaceSharedAccessAuthorizationRuleResource.
+ */
+public interface NamespaceSharedAccessAuthorizationRuleResource extends HasInner<SharedAccessAuthorizationRuleResourceInner>, Indexable, Refreshable<NamespaceSharedAccessAuthorizationRuleResource>, Updatable<NamespaceSharedAccessAuthorizationRuleResource.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the rights value.
+     */
+    List<AccessRights> rights();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the NamespaceSharedAccessAuthorizationRuleResource definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithRights, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NamespaceSharedAccessAuthorizationRuleResource definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NamespaceSharedAccessAuthorizationRuleResource definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the namespacesharedaccessauthorizationruleresource definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithRights withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the namespacesharedaccessauthorizationruleresource definition allowing to specify Rights.
+         */
+        interface WithRights {
+           /**
+            * Specifies rights.
+            */
+            WithCreate withRights(List<AccessRights> rights);
+        }
+
+        /**
+         * The stage of the namespacesharedaccessauthorizationruleresource definition allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the namespacesharedaccessauthorizationruleresource definition allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            WithCreate withName(String name);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<NamespaceSharedAccessAuthorizationRuleResource>, DefinitionStages.WithLocation, DefinitionStages.WithName {
+        }
+    }
+    /**
+     * The template for a NamespaceSharedAccessAuthorizationRuleResource update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NamespaceSharedAccessAuthorizationRuleResource>, UpdateStages.WithLocation, UpdateStages.WithName {
+    }
+
+    /**
+     * Grouping of NamespaceSharedAccessAuthorizationRuleResource update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the namespacesharedaccessauthorizationruleresource update allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             */
+            Update withLocation(String location);
+        }
+
+        /**
+         * The stage of the namespacesharedaccessauthorizationruleresource update allowing to specify Name.
+         */
+        interface WithName {
+            /**
+             * Specifies name.
+             */
+            Update withName(String name);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceState.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceState.java
new file mode 100644
index 000000000000..8d465d376ba9
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceState.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for NamespaceState.
+ */
+public enum NamespaceState {
+    /** Enum value Unknown. */
+    UNKNOWN("Unknown"),
+
+    /** Enum value Creating. */
+    CREATING("Creating"),
+
+    /** Enum value Created. */
+    CREATED("Created"),
+
+    /** Enum value Activating. */
+    ACTIVATING("Activating"),
+
+    /** Enum value Enabling. */
+    ENABLING("Enabling"),
+
+    /** Enum value Active. */
+    ACTIVE("Active"),
+
+    /** Enum value Disabling. */
+    DISABLING("Disabling"),
+
+    /** Enum value Disabled. */
+    DISABLED("Disabled"),
+
+    /** Enum value SoftDeleting. */
+    SOFT_DELETING("SoftDeleting"),
+
+    /** Enum value SoftDeleted. */
+    SOFT_DELETED("SoftDeleted"),
+
+    /** Enum value Removing. */
+    REMOVING("Removing"),
+
+    /** Enum value Removed. */
+    REMOVED("Removed"),
+
+    /** Enum value Failed. */
+    FAILED("Failed");
+
+    /** The actual serialized value for a NamespaceState instance. */
+    private String value;
+
+    NamespaceState(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a NamespaceState instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed NamespaceState object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static NamespaceState fromString(String value) {
+        NamespaceState[] items = NamespaceState.values();
+        for (NamespaceState item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceUpdateParameter.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceUpdateParameter.java
new file mode 100644
index 000000000000..cdc7dbbc98d0
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/NamespaceUpdateParameter.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters supplied to the Patch/update Namespace operation.
+ */
+public class NamespaceUpdateParameter {
+    /**
+     * Resource tags.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * The sku of the created Namespace.
+     */
+    @JsonProperty(value = "sku")
+    private Sku sku;
+
+    /**
+     * Get resource tags.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set resource tags.
+     *
+     * @param tags the tags value to set
+     * @return the NamespaceUpdateParameter object itself.
+     */
+    public NamespaceUpdateParameter withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the sku of the created Namespace.
+     *
+     * @return the sku value
+     */
+    public Sku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the sku of the created Namespace.
+     *
+     * @param sku the sku value to set
+     * @return the NamespaceUpdateParameter object itself.
+     */
+    public NamespaceUpdateParameter withSku(Sku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Namespaces.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Namespaces.java
new file mode 100644
index 000000000000..3db36e54b6db
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Namespaces.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import com.microsoft.azure.arm.resources.collection.SupportsDeletingByResourceGroup;
+import com.microsoft.azure.arm.resources.collection.SupportsBatchDeletion;
+import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
+import rx.Observable;
+import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.NamespacesInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceSharedAccessAuthorizationRuleResource;
+import rx.Completable;
+
+/**
+ * Type representing Namespaces.
+ */
+public interface Namespaces extends SupportsCreating<NamespaceResource.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<NamespaceResource>, SupportsListingByResourceGroup<NamespaceResource>, SupportsListing<NamespaceResource>, HasInner<NamespacesInner> {
+    /**
+     * Begins definition for a new AuthorizationRule resource.
+     * @param name resource name.
+     * @return the first stage of the new AuthorizationRule definition.
+     */
+    NamespaceSharedAccessAuthorizationRuleResource.DefinitionStages.Blank defineAuthorizationRule(String name);
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String name);
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+    /**
+     * Gets a list of authorization rules 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<NamespaceSharedAccessAuthorizationRuleResource> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceListKeys> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceListKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Operation.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Operation.java
new file mode 100644
index 000000000000..c58165e6b572
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Operation.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.OperationInner;
+
+/**
+ * Type representing Operation.
+ */
+public interface Operation extends HasInner<OperationInner>, HasManager<EventHubManager> {
+    /**
+     * @return the display value.
+     */
+    OperationDisplay display();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/OperationDisplay.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/OperationDisplay.java
new file mode 100644
index 000000000000..b971b7fc1384
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/OperationDisplay.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The object that represents the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft.EventHub.
+     */
+    @JsonProperty(value = "provider", access = JsonProperty.Access.WRITE_ONLY)
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed: Invoice, etc.
+     */
+    @JsonProperty(value = "resource", access = JsonProperty.Access.WRITE_ONLY)
+    private String resource;
+
+    /**
+     * Operation type: Read, write, delete, etc.
+     */
+    @JsonProperty(value = "operation", access = JsonProperty.Access.WRITE_ONLY)
+    private String operation;
+
+    /**
+     * Get service provider: Microsoft.EventHub.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Get resource on which the operation is performed: Invoice, etc.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Get operation type: Read, write, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Operations.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Operations.java
new file mode 100644
index 000000000000..6641c6f64e45
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Operations.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.OperationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Operations.
+ */
+public interface Operations extends HasInner<OperationsInner> {
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Operation> listAsync();
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Policykey.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Policykey.java
new file mode 100644
index 000000000000..7e0f34a8ebf0
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Policykey.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for Policykey.
+ */
+public enum Policykey {
+    /** Enum value PrimaryKey. */
+    PRIMARY_KEY("PrimaryKey"),
+
+    /** Enum value SecondaryKey. */
+    SECONDARY_KEY("SecondaryKey");
+
+    /** The actual serialized value for a Policykey instance. */
+    private String value;
+
+    Policykey(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a Policykey instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed Policykey object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static Policykey fromString(String value) {
+        Policykey[] items = Policykey.values();
+        for (Policykey item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/RegenerateKeysParameters.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/RegenerateKeysParameters.java
new file mode 100644
index 000000000000..650be12cbf79
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/RegenerateKeysParameters.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters supplied to the Regenerate Authorization Rule keys operation.
+ */
+public class RegenerateKeysParameters {
+    /**
+     * Key that needs to be regenerated. Possible values include: 'PrimaryKey',
+     * 'SecondaryKey'.
+     */
+    @JsonProperty(value = "policykey")
+    private Policykey policykey;
+
+    /**
+     * Get key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'.
+     *
+     * @return the policykey value
+     */
+    public Policykey policykey() {
+        return this.policykey;
+    }
+
+    /**
+     * Set key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'.
+     *
+     * @param policykey the policykey value to set
+     * @return the RegenerateKeysParameters object itself.
+     */
+    public RegenerateKeysParameters withPolicykey(Policykey policykey) {
+        this.policykey = policykey;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ResourceListKeys.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ResourceListKeys.java
new file mode 100644
index 000000000000..11028fd1f0b6
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/ResourceListKeys.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2015_08_01.implementation.ResourceListKeysInner;
+
+/**
+ * Type representing ResourceListKeys.
+ */
+public interface ResourceListKeys extends HasInner<ResourceListKeysInner>, HasManager<EventHubManager> {
+    /**
+     * @return the keyName value.
+     */
+    String keyName();
+
+    /**
+     * @return the primaryConnectionString value.
+     */
+    String primaryConnectionString();
+
+    /**
+     * @return the primaryKey value.
+     */
+    String primaryKey();
+
+    /**
+     * @return the secondaryConnectionString value.
+     */
+    String secondaryConnectionString();
+
+    /**
+     * @return the secondaryKey value.
+     */
+    String secondaryKey();
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SharedAccessAuthorizationRuleCreateOrUpdateParameters.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SharedAccessAuthorizationRuleCreateOrUpdateParameters.java
new file mode 100644
index 000000000000..9228f8aa7b4a
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SharedAccessAuthorizationRuleCreateOrUpdateParameters.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters supplied to the Create Or Update Authorization Rules operation.
+ */
+@JsonFlatten
+public class SharedAccessAuthorizationRuleCreateOrUpdateParameters {
+    /**
+     * Data center location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Name of the AuthorizationRule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The rights associated with the rule.
+     */
+    @JsonProperty(value = "properties.rights", required = true)
+    private List<AccessRights> rights;
+
+    /**
+     * Get data center location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set data center location.
+     *
+     * @param location the location value to set
+     * @return the SharedAccessAuthorizationRuleCreateOrUpdateParameters object itself.
+     */
+    public SharedAccessAuthorizationRuleCreateOrUpdateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get name of the AuthorizationRule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the AuthorizationRule.
+     *
+     * @param name the name value to set
+     * @return the SharedAccessAuthorizationRuleCreateOrUpdateParameters object itself.
+     */
+    public SharedAccessAuthorizationRuleCreateOrUpdateParameters withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the rights associated with the rule.
+     *
+     * @return the rights value
+     */
+    public List<AccessRights> rights() {
+        return this.rights;
+    }
+
+    /**
+     * Set the rights associated with the rule.
+     *
+     * @param rights the rights value to set
+     * @return the SharedAccessAuthorizationRuleCreateOrUpdateParameters object itself.
+     */
+    public SharedAccessAuthorizationRuleCreateOrUpdateParameters withRights(List<AccessRights> rights) {
+        this.rights = rights;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Sku.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Sku.java
new file mode 100644
index 000000000000..8ba789061de3
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/Sku.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU parameters supplied to the create Namespace operation.
+ */
+public class Sku {
+    /**
+     * Name of this SKU. Possible values include: 'Basic', 'Standard'.
+     */
+    @JsonProperty(value = "name")
+    private SkuName name;
+
+    /**
+     * The billing tier of this particular SKU. Possible values include:
+     * 'Basic', 'Standard', 'Premium'.
+     */
+    @JsonProperty(value = "tier", required = true)
+    private SkuTier tier;
+
+    /**
+     * The Event Hubs throughput units.
+     */
+    @JsonProperty(value = "capacity")
+    private Integer capacity;
+
+    /**
+     * Get name of this SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the name value
+     */
+    public SkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of this SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the Sku object itself.
+     */
+    public Sku withName(SkuName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the billing tier of this particular SKU. Possible values include: 'Basic', 'Standard', 'Premium'.
+     *
+     * @return the tier value
+     */
+    public SkuTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set the billing tier of this particular SKU. Possible values include: 'Basic', 'Standard', 'Premium'.
+     *
+     * @param tier the tier value to set
+     * @return the Sku object itself.
+     */
+    public Sku withTier(SkuTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+    /**
+     * Get the Event Hubs throughput units.
+     *
+     * @return the capacity value
+     */
+    public Integer capacity() {
+        return this.capacity;
+    }
+
+    /**
+     * Set the Event Hubs throughput units.
+     *
+     * @param capacity the capacity value to set
+     * @return the Sku object itself.
+     */
+    public Sku withCapacity(Integer capacity) {
+        this.capacity = capacity;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SkuName.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SkuName.java
new file mode 100644
index 000000000000..c8eadc22e018
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SkuName.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SkuName.
+ */
+public final class SkuName extends ExpandableStringEnum<SkuName> {
+    /** Static value Basic for SkuName. */
+    public static final SkuName BASIC = fromString("Basic");
+
+    /** Static value Standard for SkuName. */
+    public static final SkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a SkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SkuName
+     */
+    @JsonCreator
+    public static SkuName fromString(String name) {
+        return fromString(name, SkuName.class);
+    }
+
+    /**
+     * @return known SkuName values
+     */
+    public static Collection<SkuName> values() {
+        return values(SkuName.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SkuTier.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SkuTier.java
new file mode 100644
index 000000000000..59d073a28ff5
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/SkuTier.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SkuTier.
+ */
+public final class SkuTier extends ExpandableStringEnum<SkuTier> {
+    /** Static value Basic for SkuTier. */
+    public static final SkuTier BASIC = fromString("Basic");
+
+    /** Static value Standard for SkuTier. */
+    public static final SkuTier STANDARD = fromString("Standard");
+
+    /** Static value Premium for SkuTier. */
+    public static final SkuTier PREMIUM = fromString("Premium");
+
+    /**
+     * Creates or finds a SkuTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SkuTier
+     */
+    @JsonCreator
+    public static SkuTier fromString(String name) {
+        return fromString(name, SkuTier.class);
+    }
+
+    /**
+     * @return known SkuTier values
+     */
+    public static Collection<SkuTier> values() {
+        return values(SkuTier.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/UnavailableReason.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/UnavailableReason.java
new file mode 100644
index 000000000000..bc295db21d13
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/UnavailableReason.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for UnavailableReason.
+ */
+public enum UnavailableReason {
+    /** Enum value None. */
+    NONE("None"),
+
+    /** Enum value InvalidName. */
+    INVALID_NAME("InvalidName"),
+
+    /** Enum value SubscriptionIsDisabled. */
+    SUBSCRIPTION_IS_DISABLED("SubscriptionIsDisabled"),
+
+    /** Enum value NameInUse. */
+    NAME_IN_USE("NameInUse"),
+
+    /** Enum value NameInLockdown. */
+    NAME_IN_LOCKDOWN("NameInLockdown"),
+
+    /** Enum value TooManyNamespaceInCurrentSubscription. */
+    TOO_MANY_NAMESPACE_IN_CURRENT_SUBSCRIPTION("TooManyNamespaceInCurrentSubscription");
+
+    /** The actual serialized value for a UnavailableReason instance. */
+    private String value;
+
+    UnavailableReason(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a UnavailableReason instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed UnavailableReason object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static UnavailableReason fromString(String value) {
+        UnavailableReason[] items = UnavailableReason.values();
+        for (UnavailableReason item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/CheckNameAvailabilityResultImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/CheckNameAvailabilityResultImpl.java
new file mode 100644
index 000000000000..8465247e96a3
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/CheckNameAvailabilityResultImpl.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.CheckNameAvailabilityResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.UnavailableReason;
+
+class CheckNameAvailabilityResultImpl extends WrapperImpl<CheckNameAvailabilityResultInner> implements CheckNameAvailabilityResult {
+    private final EventHubManager manager;
+    CheckNameAvailabilityResultImpl(CheckNameAvailabilityResultInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String message() {
+        return this.inner().message();
+    }
+
+    @Override
+    public Boolean nameAvailable() {
+        return this.inner().nameAvailable();
+    }
+
+    @Override
+    public UnavailableReason reason() {
+        return this.inner().reason();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/CheckNameAvailabilityResultInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/CheckNameAvailabilityResultInner.java
new file mode 100644
index 000000000000..621a389487dc
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/CheckNameAvailabilityResultInner.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.UnavailableReason;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Result of the CheckNameAvailability operation.
+ */
+public class CheckNameAvailabilityResultInner {
+    /**
+     * Value indicating Namespace is availability, true if the Namespace is
+     * available; otherwise, false.
+     */
+    @JsonProperty(value = "nameAvailable")
+    private Boolean nameAvailable;
+
+    /**
+     * The reason for unavailability of a Namespace. Possible values include:
+     * 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse',
+     * 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription'.
+     */
+    @JsonProperty(value = "reason")
+    private UnavailableReason reason;
+
+    /**
+     * The detailed info regarding the reason associated with the Namespace.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Get value indicating Namespace is availability, true if the Namespace is available; otherwise, false.
+     *
+     * @return the nameAvailable value
+     */
+    public Boolean nameAvailable() {
+        return this.nameAvailable;
+    }
+
+    /**
+     * Set value indicating Namespace is availability, true if the Namespace is available; otherwise, false.
+     *
+     * @param nameAvailable the nameAvailable value to set
+     * @return the CheckNameAvailabilityResultInner object itself.
+     */
+    public CheckNameAvailabilityResultInner withNameAvailable(Boolean nameAvailable) {
+        this.nameAvailable = nameAvailable;
+        return this;
+    }
+
+    /**
+     * Get the reason for unavailability of a Namespace. Possible values include: 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse', 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription'.
+     *
+     * @return the reason value
+     */
+    public UnavailableReason reason() {
+        return this.reason;
+    }
+
+    /**
+     * Set the reason for unavailability of a Namespace. Possible values include: 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse', 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription'.
+     *
+     * @param reason the reason value to set
+     * @return the CheckNameAvailabilityResultInner object itself.
+     */
+    public CheckNameAvailabilityResultInner withReason(UnavailableReason reason) {
+        this.reason = reason;
+        return this;
+    }
+
+    /**
+     * Get the detailed info regarding the reason associated with the Namespace.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupResourceImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupResourceImpl.java
new file mode 100644
index 000000000000..97ea9f5e63e7
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupResourceImpl.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroupResource;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroupCreateOrUpdateParameters;
+import org.joda.time.DateTime;
+import rx.functions.Func1;
+
+class ConsumerGroupResourceImpl extends CreatableUpdatableImpl<ConsumerGroupResource, ConsumerGroupResourceInner, ConsumerGroupResourceImpl> implements ConsumerGroupResource, ConsumerGroupResource.Definition, ConsumerGroupResource.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String eventHubName;
+    private String consumerGroupName;
+    private ConsumerGroupCreateOrUpdateParameters createOrUpdateParameter;
+
+    ConsumerGroupResourceImpl(String name, EventHubManager manager) {
+        super(name, new ConsumerGroupResourceInner());
+        this.manager = manager;
+        // Set resource name
+        this.consumerGroupName = name;
+        //
+        this.createOrUpdateParameter = new ConsumerGroupCreateOrUpdateParameters();
+    }
+
+    ConsumerGroupResourceImpl(ConsumerGroupResourceInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.consumerGroupName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.eventHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "eventhubs");
+        this.consumerGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "consumergroups");
+        //
+        this.createOrUpdateParameter = new ConsumerGroupCreateOrUpdateParameters();
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ConsumerGroupResource> createResourceAsync() {
+        ConsumerGroupsInner client = this.manager().inner().consumerGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.consumerGroupName, this.createOrUpdateParameter)
+            .map(new Func1<ConsumerGroupResourceInner, ConsumerGroupResourceInner>() {
+               @Override
+               public ConsumerGroupResourceInner call(ConsumerGroupResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ConsumerGroupResource> updateResourceAsync() {
+        ConsumerGroupsInner client = this.manager().inner().consumerGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.consumerGroupName, this.createOrUpdateParameter)
+            .map(new Func1<ConsumerGroupResourceInner, ConsumerGroupResourceInner>() {
+               @Override
+               public ConsumerGroupResourceInner call(ConsumerGroupResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ConsumerGroupResourceInner> getInnerAsync() {
+        ConsumerGroupsInner client = this.manager().inner().consumerGroups();
+        return client.getAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.consumerGroupName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createOrUpdateParameter = new ConsumerGroupCreateOrUpdateParameters();
+    }
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public String eventHubPath() {
+        return this.inner().eventHubPath();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public String userMetadata() {
+        return this.inner().userMetadata();
+    }
+
+    @Override
+    public ConsumerGroupResourceImpl withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        this.eventHubName = eventHubName;
+        return this;
+    }
+
+    @Override
+    public ConsumerGroupResourceImpl withLocation(String location) {
+        this.createOrUpdateParameter.withLocation(location);
+        return this;
+    }
+
+    @Override
+    public ConsumerGroupResourceImpl withName(String name) {
+        this.createOrUpdateParameter.withName(name);
+        return this;
+    }
+
+    @Override
+    public ConsumerGroupResourceImpl withType(String type) {
+        this.createOrUpdateParameter.withType(type);
+        return this;
+    }
+
+    @Override
+    public ConsumerGroupResourceImpl withUserMetadata(String userMetadata) {
+        this.createOrUpdateParameter.withUserMetadata(userMetadata);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupResourceInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupResourceInner.java
new file mode 100644
index 000000000000..ba1bd94addb0
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupResourceInner.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in List or Get Consumer group operation.
+ */
+@JsonFlatten
+public class ConsumerGroupResourceInner extends ProxyResource {
+    /**
+     * Exact time the message was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * The path of the Event Hub.
+     */
+    @JsonProperty(value = "properties.eventHubPath", access = JsonProperty.Access.WRITE_ONLY)
+    private String eventHubPath;
+
+    /**
+     * The exact time the message was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * The user metadata.
+     */
+    @JsonProperty(value = "properties.userMetadata")
+    private String userMetadata;
+
+    /**
+     * Resource location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Get exact time the message was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get the path of the Event Hub.
+     *
+     * @return the eventHubPath value
+     */
+    public String eventHubPath() {
+        return this.eventHubPath;
+    }
+
+    /**
+     * Get the exact time the message was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get the user metadata.
+     *
+     * @return the userMetadata value
+     */
+    public String userMetadata() {
+        return this.userMetadata;
+    }
+
+    /**
+     * Set the user metadata.
+     *
+     * @param userMetadata the userMetadata value to set
+     * @return the ConsumerGroupResourceInner object itself.
+     */
+    public ConsumerGroupResourceInner withUserMetadata(String userMetadata) {
+        this.userMetadata = userMetadata;
+        return this;
+    }
+
+    /**
+     * Get resource location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set resource location.
+     *
+     * @param location the location value to set
+     * @return the ConsumerGroupResourceInner object itself.
+     */
+    public ConsumerGroupResourceInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupsImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupsImpl.java
new file mode 100644
index 000000000000..e50f6b796310
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupsImpl.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroups;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroupResource;
+
+class ConsumerGroupsImpl extends WrapperImpl<ConsumerGroupsInner> implements ConsumerGroups {
+    private final EventHubManager manager;
+
+    ConsumerGroupsImpl(EventHubManager manager) {
+        super(manager.inner().consumerGroups());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ConsumerGroupResourceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ConsumerGroupResourceImpl wrapModel(ConsumerGroupResourceInner inner) {
+        return  new ConsumerGroupResourceImpl(inner, manager());
+    }
+
+    private ConsumerGroupResourceImpl wrapModel(String name) {
+        return new ConsumerGroupResourceImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ConsumerGroupResource> listAllAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        ConsumerGroupsInner client = this.inner();
+        return client.listAllAsync(resourceGroupName, namespaceName, eventHubName)
+        .flatMapIterable(new Func1<Page<ConsumerGroupResourceInner>, Iterable<ConsumerGroupResourceInner>>() {
+            @Override
+            public Iterable<ConsumerGroupResourceInner> call(Page<ConsumerGroupResourceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ConsumerGroupResourceInner, ConsumerGroupResource>() {
+            @Override
+            public ConsumerGroupResource call(ConsumerGroupResourceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ConsumerGroupResource> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        ConsumerGroupsInner client = this.inner();
+        return client.getAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName)
+        .map(new Func1<ConsumerGroupResourceInner, ConsumerGroupResource>() {
+            @Override
+            public ConsumerGroupResource call(ConsumerGroupResourceInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        ConsumerGroupsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toCompletable();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupsInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupsInner.java
new file mode 100644
index 000000000000..cef2d9cf8e06
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ConsumerGroupsInner.java
@@ -0,0 +1,637 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroupCreateOrUpdateParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ConsumerGroups.
+ */
+public class ConsumerGroupsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ConsumerGroupsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ConsumerGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ConsumerGroupsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(ConsumerGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ConsumerGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ConsumerGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups/{consumerGroupName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("consumerGroupName") String consumerGroupName, @Path("subscriptionId") String subscriptionId, @Body ConsumerGroupCreateOrUpdateParameters parameters, @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.eventhub.v2015_08_01.ConsumerGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups/{consumerGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("consumerGroupName") String consumerGroupName, @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.eventhub.v2015_08_01.ConsumerGroups get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups/{consumerGroupName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("consumerGroupName") String consumerGroupName, @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.eventhub.v2015_08_01.ConsumerGroups listAll" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups")
+        Observable<Response<ResponseBody>> listAll(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2015_08_01.ConsumerGroups listAllNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAllNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param parameters Parameters supplied to create or update a consumer group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ConsumerGroupResourceInner object if successful.
+     */
+    public ConsumerGroupResourceInner createOrUpdate(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, ConsumerGroupCreateOrUpdateParameters parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param parameters Parameters supplied to create or update a consumer group resource.
+     * @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<ConsumerGroupResourceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, ConsumerGroupCreateOrUpdateParameters parameters, final ServiceCallback<ConsumerGroupResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param parameters Parameters supplied to create or update a consumer group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupResourceInner object
+     */
+    public Observable<ConsumerGroupResourceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, ConsumerGroupCreateOrUpdateParameters parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName, parameters).map(new Func1<ServiceResponse<ConsumerGroupResourceInner>, ConsumerGroupResourceInner>() {
+            @Override
+            public ConsumerGroupResourceInner call(ServiceResponse<ConsumerGroupResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param parameters Parameters supplied to create or update a consumer group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupResourceInner object
+     */
+    public Observable<ServiceResponse<ConsumerGroupResourceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, ConsumerGroupCreateOrUpdateParameters parameters) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConsumerGroupResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConsumerGroupResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConsumerGroupResourceInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConsumerGroupResourceInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConsumerGroupResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConsumerGroupResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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.delete(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ConsumerGroupResourceInner object if successful.
+     */
+    public ConsumerGroupResourceInner get(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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<ConsumerGroupResourceInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, final ServiceCallback<ConsumerGroupResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupResourceInner object
+     */
+    public Observable<ConsumerGroupResourceInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).map(new Func1<ServiceResponse<ConsumerGroupResourceInner>, ConsumerGroupResourceInner>() {
+            @Override
+            public ConsumerGroupResourceInner call(ServiceResponse<ConsumerGroupResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupResourceInner object
+     */
+    public Observable<ServiceResponse<ConsumerGroupResourceInner>> getWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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.get(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConsumerGroupResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConsumerGroupResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConsumerGroupResourceInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConsumerGroupResourceInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConsumerGroupResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConsumerGroupResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;ConsumerGroupResourceInner&gt; object if successful.
+     */
+    public PagedList<ConsumerGroupResourceInner> listAll(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        ServiceResponse<Page<ConsumerGroupResourceInner>> response = listAllSinglePageAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single();
+        return new PagedList<ConsumerGroupResourceInner>(response.body()) {
+            @Override
+            public Page<ConsumerGroupResourceInner> nextPage(String nextPageLink) {
+                return listAllNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<ConsumerGroupResourceInner>> listAllAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final ListOperationCallback<ConsumerGroupResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAllSinglePageAsync(resourceGroupName, namespaceName, eventHubName),
+            new Func1<String, Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> call(String nextPageLink) {
+                    return listAllNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ConsumerGroupResourceInner&gt; object
+     */
+    public Observable<Page<ConsumerGroupResourceInner>> listAllAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listAllWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName)
+            .map(new Func1<ServiceResponse<Page<ConsumerGroupResourceInner>>, Page<ConsumerGroupResourceInner>>() {
+                @Override
+                public Page<ConsumerGroupResourceInner> call(ServiceResponse<Page<ConsumerGroupResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ConsumerGroupResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> listAllWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listAllSinglePageAsync(resourceGroupName, namespaceName, eventHubName)
+            .concatMap(new Func1<ServiceResponse<Page<ConsumerGroupResourceInner>>, Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> call(ServiceResponse<Page<ConsumerGroupResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAllNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+    ServiceResponse<PageImpl<ConsumerGroupResourceInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<ConsumerGroupResourceInner>> * @param namespaceName The Namespace name
+    ServiceResponse<PageImpl<ConsumerGroupResourceInner>> * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ConsumerGroupResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> listAllSinglePageAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.listAll(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ConsumerGroupResourceInner>> result = listAllDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ConsumerGroupResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ConsumerGroupResourceInner>> listAllDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ConsumerGroupResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ConsumerGroupResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;ConsumerGroupResourceInner&gt; object if successful.
+     */
+    public PagedList<ConsumerGroupResourceInner> listAllNext(final String nextPageLink) {
+        ServiceResponse<Page<ConsumerGroupResourceInner>> response = listAllNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ConsumerGroupResourceInner>(response.body()) {
+            @Override
+            public Page<ConsumerGroupResourceInner> nextPage(String nextPageLink) {
+                return listAllNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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<ConsumerGroupResourceInner>> listAllNextAsync(final String nextPageLink, final ServiceFuture<List<ConsumerGroupResourceInner>> serviceFuture, final ListOperationCallback<ConsumerGroupResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAllNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> call(String nextPageLink) {
+                    return listAllNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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;ConsumerGroupResourceInner&gt; object
+     */
+    public Observable<Page<ConsumerGroupResourceInner>> listAllNextAsync(final String nextPageLink) {
+        return listAllNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ConsumerGroupResourceInner>>, Page<ConsumerGroupResourceInner>>() {
+                @Override
+                public Page<ConsumerGroupResourceInner> call(ServiceResponse<Page<ConsumerGroupResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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;ConsumerGroupResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> listAllNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAllNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ConsumerGroupResourceInner>>, Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> call(ServiceResponse<Page<ConsumerGroupResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAllNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+    ServiceResponse<PageImpl<ConsumerGroupResourceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ConsumerGroupResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> listAllNextSinglePageAsync(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.listAllNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ConsumerGroupResourceInner>> result = listAllNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ConsumerGroupResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ConsumerGroupResourceInner>> listAllNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ConsumerGroupResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ConsumerGroupResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubManagementClientImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubManagementClientImpl.java
new file mode 100644
index 000000000000..1d2981ff6ec5
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubManagementClientImpl.java
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the EventHubManagementClientImpl class.
+ */
+public class EventHubManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. */
+    private String subscriptionId;
+
+    /**
+     * Gets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** Client API Version. */
+    private String apiVersion;
+
+    /**
+     * Gets Client API Version.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The OperationsInner object to access its operations.
+     */
+    private OperationsInner operations;
+
+    /**
+     * Gets the OperationsInner object to access its operations.
+     * @return the OperationsInner object.
+     */
+    public OperationsInner operations() {
+        return this.operations;
+    }
+
+    /**
+     * The NamespacesInner object to access its operations.
+     */
+    private NamespacesInner namespaces;
+
+    /**
+     * Gets the NamespacesInner object to access its operations.
+     * @return the NamespacesInner object.
+     */
+    public NamespacesInner namespaces() {
+        return this.namespaces;
+    }
+
+    /**
+     * The EventHubsInner object to access its operations.
+     */
+    private EventHubsInner eventHubs;
+
+    /**
+     * Gets the EventHubsInner object to access its operations.
+     * @return the EventHubsInner object.
+     */
+    public EventHubsInner eventHubs() {
+        return this.eventHubs;
+    }
+
+    /**
+     * The ConsumerGroupsInner object to access its operations.
+     */
+    private ConsumerGroupsInner consumerGroups;
+
+    /**
+     * Gets the ConsumerGroupsInner object to access its operations.
+     * @return the ConsumerGroupsInner object.
+     */
+    public ConsumerGroupsInner consumerGroups() {
+        return this.consumerGroups;
+    }
+
+    /**
+     * Initializes an instance of EventHubManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public EventHubManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of EventHubManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public EventHubManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of EventHubManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public EventHubManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2015-08-01";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.namespaces = new NamespacesInner(restClient().retrofit(), this);
+        this.eventHubs = new EventHubsInner(restClient().retrofit(), this);
+        this.consumerGroups = new ConsumerGroupsInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "EventHubManagementClient", "2015-08-01");
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubManager.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubManager.java
new file mode 100644
index 000000000000..6923e3f77748
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubManager.java
@@ -0,0 +1,135 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Operations;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Namespaces;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventHubs;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ConsumerGroups;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure EventHub resource management.
+ */
+public final class EventHubManager extends ManagerCore<EventHubManager, EventHubManagementClientImpl> {
+    private Operations operations;
+    private Namespaces namespaces;
+    private EventHubs eventHubs;
+    private ConsumerGroups consumerGroups;
+    /**
+    * Get a Configurable instance that can be used to create EventHubManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new EventHubManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of EventHubManager that exposes EventHub resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the EventHubManager
+    */
+    public static EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new EventHubManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of EventHubManager that exposes EventHub resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the EventHubManager
+    */
+    public static EventHubManager authenticate(RestClient restClient, String subscriptionId) {
+        return new EventHubManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of EventHubManager that exposes EventHub management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing EventHub management API entry points that work across subscriptions
+        */
+        EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+     * @return Entry point to manage Namespaces.
+     */
+    public Namespaces namespaces() {
+        if (this.namespaces == null) {
+            this.namespaces = new NamespacesImpl(this);
+        }
+        return this.namespaces;
+    }
+
+    /**
+     * @return Entry point to manage EventHubs.
+     */
+    public EventHubs eventHubs() {
+        if (this.eventHubs == null) {
+            this.eventHubs = new EventHubsImpl(this);
+        }
+        return this.eventHubs;
+    }
+
+    /**
+     * @return Entry point to manage ConsumerGroups.
+     */
+    public ConsumerGroups consumerGroups() {
+        if (this.consumerGroups == null) {
+            this.consumerGroups = new ConsumerGroupsImpl(this);
+        }
+        return this.consumerGroups;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return EventHubManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private EventHubManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new EventHubManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubResourceImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubResourceImpl.java
new file mode 100644
index 000000000000..9ca1cc794158
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubResourceImpl.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventHubResource;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventHubCreateOrUpdateParameters;
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EntityStatus;
+import rx.functions.Func1;
+
+class EventHubResourceImpl extends CreatableUpdatableImpl<EventHubResource, EventHubResourceInner, EventHubResourceImpl> implements EventHubResource, EventHubResource.Definition, EventHubResource.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String eventHubName;
+    private EventHubCreateOrUpdateParameters createOrUpdateParameter;
+
+    EventHubResourceImpl(String name, EventHubManager manager) {
+        super(name, new EventHubResourceInner());
+        this.manager = manager;
+        // Set resource name
+        this.eventHubName = name;
+        //
+        this.createOrUpdateParameter = new EventHubCreateOrUpdateParameters();
+    }
+
+    EventHubResourceImpl(EventHubResourceInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.eventHubName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.eventHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "eventhubs");
+        //
+        this.createOrUpdateParameter = new EventHubCreateOrUpdateParameters();
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<EventHubResource> createResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.createOrUpdateParameter)
+            .map(new Func1<EventHubResourceInner, EventHubResourceInner>() {
+               @Override
+               public EventHubResourceInner call(EventHubResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<EventHubResource> updateResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.createOrUpdateParameter)
+            .map(new Func1<EventHubResourceInner, EventHubResourceInner>() {
+               @Override
+               public EventHubResourceInner call(EventHubResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<EventHubResourceInner> getInnerAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.getAsync(this.resourceGroupName, this.namespaceName, this.eventHubName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createOrUpdateParameter = new EventHubCreateOrUpdateParameters();
+    }
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public Long messageRetentionInDays() {
+        return this.inner().messageRetentionInDays();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Long partitionCount() {
+        return this.inner().partitionCount();
+    }
+
+    @Override
+    public List<String> partitionIds() {
+        return this.inner().partitionIds();
+    }
+
+    @Override
+    public EntityStatus status() {
+        return this.inner().status();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public EventHubResourceImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+    @Override
+    public EventHubResourceImpl withLocation(String location) {
+        this.createOrUpdateParameter.withLocation(location);
+        return this;
+    }
+
+    @Override
+    public EventHubResourceImpl withMessageRetentionInDays(Long messageRetentionInDays) {
+        this.createOrUpdateParameter.withMessageRetentionInDays(messageRetentionInDays);
+        return this;
+    }
+
+    @Override
+    public EventHubResourceImpl withName(String name) {
+        this.createOrUpdateParameter.withName(name);
+        return this;
+    }
+
+    @Override
+    public EventHubResourceImpl withPartitionCount(Long partitionCount) {
+        this.createOrUpdateParameter.withPartitionCount(partitionCount);
+        return this;
+    }
+
+    @Override
+    public EventHubResourceImpl withStatus(EntityStatus status) {
+        this.createOrUpdateParameter.withStatus(status);
+        return this;
+    }
+
+    @Override
+    public EventHubResourceImpl withType(String type) {
+        this.createOrUpdateParameter.withType(type);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubResourceInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubResourceInner.java
new file mode 100644
index 000000000000..56e6884b207c
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubResourceInner.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EntityStatus;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in List or Get Event Hub operation.
+ */
+@JsonFlatten
+public class EventHubResourceInner extends ProxyResource {
+    /**
+     * Exact time the Event Hub was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * Number of days to retain the events for this Event Hub.
+     */
+    @JsonProperty(value = "properties.messageRetentionInDays")
+    private Long messageRetentionInDays;
+
+    /**
+     * Number of partitions created for the Event Hub.
+     */
+    @JsonProperty(value = "properties.partitionCount")
+    private Long partitionCount;
+
+    /**
+     * Current number of shards on the Event Hub.
+     */
+    @JsonProperty(value = "properties.partitionIds", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> partitionIds;
+
+    /**
+     * Enumerates the possible values for the status of the Event Hub. Possible
+     * values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled',
+     * 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     */
+    @JsonProperty(value = "properties.status")
+    private EntityStatus status;
+
+    /**
+     * The exact time the message was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * Resource location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Get exact time the Event Hub was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get number of days to retain the events for this Event Hub.
+     *
+     * @return the messageRetentionInDays value
+     */
+    public Long messageRetentionInDays() {
+        return this.messageRetentionInDays;
+    }
+
+    /**
+     * Set number of days to retain the events for this Event Hub.
+     *
+     * @param messageRetentionInDays the messageRetentionInDays value to set
+     * @return the EventHubResourceInner object itself.
+     */
+    public EventHubResourceInner withMessageRetentionInDays(Long messageRetentionInDays) {
+        this.messageRetentionInDays = messageRetentionInDays;
+        return this;
+    }
+
+    /**
+     * Get number of partitions created for the Event Hub.
+     *
+     * @return the partitionCount value
+     */
+    public Long partitionCount() {
+        return this.partitionCount;
+    }
+
+    /**
+     * Set number of partitions created for the Event Hub.
+     *
+     * @param partitionCount the partitionCount value to set
+     * @return the EventHubResourceInner object itself.
+     */
+    public EventHubResourceInner withPartitionCount(Long partitionCount) {
+        this.partitionCount = partitionCount;
+        return this;
+    }
+
+    /**
+     * Get current number of shards on the Event Hub.
+     *
+     * @return the partitionIds value
+     */
+    public List<String> partitionIds() {
+        return this.partitionIds;
+    }
+
+    /**
+     * Get enumerates the possible values for the status of the Event Hub. Possible values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     *
+     * @return the status value
+     */
+    public EntityStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Set enumerates the possible values for the status of the Event Hub. Possible values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     *
+     * @param status the status value to set
+     * @return the EventHubResourceInner object itself.
+     */
+    public EventHubResourceInner withStatus(EntityStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get the exact time the message was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get resource location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set resource location.
+     *
+     * @param location the location value to set
+     * @return the EventHubResourceInner object itself.
+     */
+    public EventHubResourceInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubsImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubsImpl.java
new file mode 100644
index 000000000000..4797b12ef1b4
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubsImpl.java
@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventHubs;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventHubResource;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventhubNamespaceSharedAccessAuthorizationRuleResource;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceSharedAccessAuthorizationRuleResource;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ResourceListKeys;
+
+class EventHubsImpl extends WrapperImpl<EventHubsInner> implements EventHubs {
+    private final EventHubManager manager;
+
+    EventHubsImpl(EventHubManager manager) {
+        super(manager.inner().eventHubs());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public EventHubResourceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private EventHubResourceImpl wrapModel(EventHubResourceInner inner) {
+        return  new EventHubResourceImpl(inner, manager());
+    }
+
+    private EventHubResourceImpl wrapModel(String name) {
+        return new EventHubResourceImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<EventHubResource> listAllAsync(final String resourceGroupName, final String namespaceName) {
+        EventHubsInner client = this.inner();
+        return client.listAllAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<EventHubResourceInner>, Iterable<EventHubResourceInner>>() {
+            @Override
+            public Iterable<EventHubResourceInner> call(Page<EventHubResourceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EventHubResourceInner, EventHubResource>() {
+            @Override
+            public EventHubResource call(EventHubResourceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<EventHubResource> getAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        EventHubsInner client = this.inner();
+        return client.getAsync(resourceGroupName, namespaceName, eventHubName)
+        .map(new Func1<EventHubResourceInner, EventHubResource>() {
+            @Override
+            public EventHubResource call(EventHubResourceInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        EventHubsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, namespaceName, eventHubName).toCompletable();
+    }
+
+    @Override
+    public EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl defineAuthorizationRule(String name) {
+        return wrapAuthorizationRuleModel(name);
+    }
+
+    private EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl wrapAuthorizationRuleModel(String name) {
+        return new EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl(name, this.manager());
+    }
+
+    private EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl wrapEventhubNamespaceSharedAccessAuthorizationRuleResourceModel(SharedAccessAuthorizationRuleResourceInner inner) {
+        return  new EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl(inner, manager());
+    }
+
+    private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAuthorizationRuleResourceInnerUsingEventHubsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String eventHubName = IdParsingUtils.getValueFromIdByName(id, "eventhubs");
+        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "authorizationRules");
+        EventHubsInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName);
+    }
+
+    @Override
+    public Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
+        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, EventhubNamespaceSharedAccessAuthorizationRuleResource>() {
+            @Override
+            public EventhubNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
+                return wrapEventhubNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        EventHubsInner client = this.inner();
+        return client.listAuthorizationRulesAsync(resourceGroupName, namespaceName, eventHubName)
+        .flatMapIterable(new Func1<Page<SharedAccessAuthorizationRuleResourceInner>, Iterable<SharedAccessAuthorizationRuleResourceInner>>() {
+            @Override
+            public Iterable<SharedAccessAuthorizationRuleResourceInner> call(Page<SharedAccessAuthorizationRuleResourceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, EventhubNamespaceSharedAccessAuthorizationRuleResource>() {
+            @Override
+            public EventhubNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
+                return wrapEventhubNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.deleteAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toCompletable();
+    }
+
+    @Override
+    public Observable<NamespaceSharedAccessAuthorizationRuleResource> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.posttAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
+        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
+            @Override
+            public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
+                return new NamespaceSharedAccessAuthorizationRuleResourceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceListKeys> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.listKeysAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
+        .map(new Func1<ResourceListKeysInner, ResourceListKeys>() {
+            @Override
+            public ResourceListKeys call(ResourceListKeysInner inner) {
+                return new ResourceListKeysImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceListKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.regenerateKeysAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
+        .map(new Func1<ResourceListKeysInner, ResourceListKeys>() {
+            @Override
+            public ResourceListKeys call(ResourceListKeysInner inner) {
+                return new ResourceListKeysImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubsInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubsInner.java
new file mode 100644
index 000000000000..59734e4b5763
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventHubsInner.java
@@ -0,0 +1,1596 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventHubCreateOrUpdateParameters;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Policykey;
+import com.microsoft.azure.management.eventhub.v2015_08_01.RegenerateKeysParameters;
+import com.microsoft.azure.management.eventhub.v2015_08_01.SharedAccessAuthorizationRuleCreateOrUpdateParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in EventHubs.
+ */
+public class EventHubsInner {
+    /** The Retrofit service to perform REST calls. */
+    private EventHubsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of EventHubsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public EventHubsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(EventHubsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for EventHubs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface EventHubsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.EventHubs listAll" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs")
+        Observable<Response<ResponseBody>> listAll(@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.eventhub.v2015_08_01.EventHubs createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("subscriptionId") String subscriptionId, @Body EventHubCreateOrUpdateParameters parameters, @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.eventhub.v2015_08_01.EventHubs delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2015_08_01.EventHubs get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2015_08_01.EventHubs listAuthorizationRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules")
+        Observable<Response<ResponseBody>> listAuthorizationRules(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2015_08_01.EventHubs createOrUpdateAuthorizationRule" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdateAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Body SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters, @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.eventhub.v2015_08_01.EventHubs getAuthorizationRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> getAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.EventHubs posttAuthorizationRule" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> posttAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.EventHubs deleteAuthorizationRule" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.EventHubs listKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/ListKeys")
+        Observable<Response<ResponseBody>> listKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.EventHubs regenerateKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/regenerateKeys")
+        Observable<Response<ResponseBody>> regenerateKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body RegenerateKeysParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.EventHubs listAllNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAllNext(@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.eventhub.v2015_08_01.EventHubs listAuthorizationRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAuthorizationRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the Event Hubs in 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 CloudException 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;EventHubResourceInner&gt; object if successful.
+     */
+    public PagedList<EventHubResourceInner> listAll(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<EventHubResourceInner>> response = listAllSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<EventHubResourceInner>(response.body()) {
+            @Override
+            public Page<EventHubResourceInner> nextPage(String nextPageLink) {
+                return listAllNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Event Hubs in 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<EventHubResourceInner>> listAllAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<EventHubResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAllSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<EventHubResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventHubResourceInner>>> call(String nextPageLink) {
+                    return listAllNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventHubResourceInner&gt; object
+     */
+    public Observable<Page<EventHubResourceInner>> listAllAsync(final String resourceGroupName, final String namespaceName) {
+        return listAllWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<EventHubResourceInner>>, Page<EventHubResourceInner>>() {
+                @Override
+                public Page<EventHubResourceInner> call(ServiceResponse<Page<EventHubResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventHubResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EventHubResourceInner>>> listAllWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listAllSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<EventHubResourceInner>>, Observable<ServiceResponse<Page<EventHubResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventHubResourceInner>>> call(ServiceResponse<Page<EventHubResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAllNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+    ServiceResponse<PageImpl<EventHubResourceInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<EventHubResourceInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EventHubResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EventHubResourceInner>>> listAllSinglePageAsync(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.listAll(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EventHubResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventHubResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EventHubResourceInner>> result = listAllDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EventHubResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EventHubResourceInner>> listAllDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EventHubResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EventHubResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the EventHubResourceInner object if successful.
+     */
+    public EventHubResourceInner createOrUpdate(String resourceGroupName, String namespaceName, String eventHubName, EventHubCreateOrUpdateParameters parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @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<EventHubResourceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, EventHubCreateOrUpdateParameters parameters, final ServiceCallback<EventHubResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventHubResourceInner object
+     */
+    public Observable<EventHubResourceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, EventHubCreateOrUpdateParameters parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, parameters).map(new Func1<ServiceResponse<EventHubResourceInner>, EventHubResourceInner>() {
+            @Override
+            public EventHubResourceInner call(ServiceResponse<EventHubResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventHubResourceInner object
+     */
+    public Observable<ServiceResponse<EventHubResourceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, EventHubCreateOrUpdateParameters parameters) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EventHubResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EventHubResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EventHubResourceInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EventHubResourceInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EventHubResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EventHubResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String namespaceName, String eventHubName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName), serviceCallback);
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.delete(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the EventHubResourceInner object if successful.
+     */
+    public EventHubResourceInner get(String resourceGroupName, String namespaceName, String eventHubName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<EventHubResourceInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName, final ServiceCallback<EventHubResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName), serviceCallback);
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventHubResourceInner object
+     */
+    public Observable<EventHubResourceInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).map(new Func1<ServiceResponse<EventHubResourceInner>, EventHubResourceInner>() {
+            @Override
+            public EventHubResourceInner call(ServiceResponse<EventHubResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventHubResourceInner object
+     */
+    public Observable<ServiceResponse<EventHubResourceInner>> getWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.get(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EventHubResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EventHubResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EventHubResourceInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EventHubResourceInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EventHubResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EventHubResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;SharedAccessAuthorizationRuleResourceInner&gt; object if successful.
+     */
+    public PagedList<SharedAccessAuthorizationRuleResourceInner> listAuthorizationRules(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response = listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single();
+        return new PagedList<SharedAccessAuthorizationRuleResourceInner>(response.body()) {
+            @Override
+            public Page<SharedAccessAuthorizationRuleResourceInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final ListOperationCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, eventHubName),
+            new Func1<String, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<Page<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listAuthorizationRulesWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName)
+            .map(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Page<SharedAccessAuthorizationRuleResourceInner>>() {
+                @Override
+                public Page<SharedAccessAuthorizationRuleResourceInner> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, eventHubName)
+            .concatMap(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param namespaceName The Namespace name
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SharedAccessAuthorizationRuleResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesSinglePageAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.listAuthorizationRules(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> result = listAuthorizationRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SharedAccessAuthorizationRuleResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SharedAccessAuthorizationRuleResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SharedAccessAuthorizationRuleResourceInner object if successful.
+     */
+    public SharedAccessAuthorizationRuleResourceInner createOrUpdateAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @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<SharedAccessAuthorizationRuleResourceInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<SharedAccessAuthorizationRuleResourceInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
+            @Override
+            public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAccessAuthorizationRuleResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> createOrUpdateAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdateAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = createOrUpdateAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> createOrUpdateAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SharedAccessAuthorizationRuleResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SharedAccessAuthorizationRuleResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SharedAccessAuthorizationRuleResourceInner object if successful.
+     */
+    public SharedAccessAuthorizationRuleResourceInner getAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<SharedAccessAuthorizationRuleResourceInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<SharedAccessAuthorizationRuleResourceInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
+            @Override
+            public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAccessAuthorizationRuleResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> getAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.getAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = getAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> getAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SharedAccessAuthorizationRuleResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SharedAccessAuthorizationRuleResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SharedAccessAuthorizationRuleResourceInner object if successful.
+     */
+    public SharedAccessAuthorizationRuleResourceInner posttAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return posttAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<SharedAccessAuthorizationRuleResourceInner> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(posttAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<SharedAccessAuthorizationRuleResourceInner> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return posttAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
+            @Override
+            public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAccessAuthorizationRuleResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> posttAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.posttAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = posttAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> posttAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SharedAccessAuthorizationRuleResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SharedAccessAuthorizationRuleResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void deleteAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.deleteAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceListKeysInner object if successful.
+     */
+    public ResourceListKeysInner listKeys(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<ResourceListKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<ResourceListKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ResourceListKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<ResourceListKeysInner>, ResourceListKeysInner>() {
+            @Override
+            public ResourceListKeysInner call(ServiceResponse<ResourceListKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ServiceResponse<ResourceListKeysInner>> listKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.listKeys(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceListKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceListKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceListKeysInner> clientResponse = listKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceListKeysInner> listKeysDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceListKeysInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceListKeysInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceListKeysInner object if successful.
+     */
+    public ResourceListKeysInner regenerateKeys(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<ResourceListKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<ResourceListKeysInner>, ResourceListKeysInner>() {
+            @Override
+            public ResourceListKeysInner call(ServiceResponse<ResourceListKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ServiceResponse<ResourceListKeysInner>> regenerateKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.");
+        }
+        final Policykey policykey = null;
+        RegenerateKeysParameters parameters = new RegenerateKeysParameters();
+        parameters.withPolicykey(null);
+        return service.regenerateKeys(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceListKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceListKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceListKeysInner> clientResponse = regenerateKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceListKeysInner object if successful.
+     */
+    public ResourceListKeysInner regenerateKeys(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, Policykey policykey) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, policykey).toBlocking().single().body();
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @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<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, Policykey policykey, final ServiceCallback<ResourceListKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, policykey), serviceCallback);
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, Policykey policykey) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, policykey).map(new Func1<ServiceResponse<ResourceListKeysInner>, ResourceListKeysInner>() {
+            @Override
+            public ResourceListKeysInner call(ServiceResponse<ResourceListKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ServiceResponse<ResourceListKeysInner>> regenerateKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, Policykey policykey) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.");
+        }
+        RegenerateKeysParameters parameters = new RegenerateKeysParameters();
+        parameters.withPolicykey(policykey);
+        return service.regenerateKeys(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceListKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceListKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceListKeysInner> clientResponse = regenerateKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceListKeysInner> regenerateKeysDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceListKeysInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceListKeysInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;EventHubResourceInner&gt; object if successful.
+     */
+    public PagedList<EventHubResourceInner> listAllNext(final String nextPageLink) {
+        ServiceResponse<Page<EventHubResourceInner>> response = listAllNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EventHubResourceInner>(response.body()) {
+            @Override
+            public Page<EventHubResourceInner> nextPage(String nextPageLink) {
+                return listAllNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Event Hubs in 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<EventHubResourceInner>> listAllNextAsync(final String nextPageLink, final ServiceFuture<List<EventHubResourceInner>> serviceFuture, final ListOperationCallback<EventHubResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAllNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EventHubResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventHubResourceInner>>> call(String nextPageLink) {
+                    return listAllNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventHubResourceInner&gt; object
+     */
+    public Observable<Page<EventHubResourceInner>> listAllNextAsync(final String nextPageLink) {
+        return listAllNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EventHubResourceInner>>, Page<EventHubResourceInner>>() {
+                @Override
+                public Page<EventHubResourceInner> call(ServiceResponse<Page<EventHubResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventHubResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EventHubResourceInner>>> listAllNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAllNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EventHubResourceInner>>, Observable<ServiceResponse<Page<EventHubResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventHubResourceInner>>> call(ServiceResponse<Page<EventHubResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAllNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+    ServiceResponse<PageImpl<EventHubResourceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EventHubResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EventHubResourceInner>>> listAllNextSinglePageAsync(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.listAllNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EventHubResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventHubResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EventHubResourceInner>> result = listAllNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EventHubResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EventHubResourceInner>> listAllNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EventHubResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EventHubResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;SharedAccessAuthorizationRuleResourceInner&gt; object if successful.
+     */
+    public PagedList<SharedAccessAuthorizationRuleResourceInner> listAuthorizationRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response = listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SharedAccessAuthorizationRuleResourceInner>(response.body()) {
+            @Override
+            public Page<SharedAccessAuthorizationRuleResourceInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesNextAsync(final String nextPageLink, final ServiceFuture<List<SharedAccessAuthorizationRuleResourceInner>> serviceFuture, final ListOperationCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<Page<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesNextAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Page<SharedAccessAuthorizationRuleResourceInner>>() {
+                @Override
+                public Page<SharedAccessAuthorizationRuleResourceInner> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SharedAccessAuthorizationRuleResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesNextSinglePageAsync(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.listAuthorizationRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> result = listAuthorizationRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SharedAccessAuthorizationRuleResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SharedAccessAuthorizationRuleResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl.java
new file mode 100644
index 000000000000..4172f80249a9
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.EventhubNamespaceSharedAccessAuthorizationRuleResource;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.SharedAccessAuthorizationRuleCreateOrUpdateParameters;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2015_08_01.AccessRights;
+import rx.functions.Func1;
+
+class EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl extends CreatableUpdatableImpl<EventhubNamespaceSharedAccessAuthorizationRuleResource, SharedAccessAuthorizationRuleResourceInner, EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl> implements EventhubNamespaceSharedAccessAuthorizationRuleResource, EventhubNamespaceSharedAccessAuthorizationRuleResource.Definition, EventhubNamespaceSharedAccessAuthorizationRuleResource.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String eventHubName;
+    private String authorizationRuleName;
+    private SharedAccessAuthorizationRuleCreateOrUpdateParameters createOrUpdateParameter;
+
+    EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl(String name, EventHubManager manager) {
+        super(name, new SharedAccessAuthorizationRuleResourceInner());
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = name;
+        //
+        this.createOrUpdateParameter = new SharedAccessAuthorizationRuleCreateOrUpdateParameters();
+    }
+
+    EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl(SharedAccessAuthorizationRuleResourceInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.eventHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "eventhubs");
+        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "authorizationRules");
+        //
+        this.createOrUpdateParameter = new SharedAccessAuthorizationRuleCreateOrUpdateParameters();
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> createResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.authorizationRuleName, this.createOrUpdateParameter)
+            .map(new Func1<SharedAccessAuthorizationRuleResourceInner, SharedAccessAuthorizationRuleResourceInner>() {
+               @Override
+               public SharedAccessAuthorizationRuleResourceInner call(SharedAccessAuthorizationRuleResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> updateResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.authorizationRuleName, this.createOrUpdateParameter)
+            .map(new Func1<SharedAccessAuthorizationRuleResourceInner, SharedAccessAuthorizationRuleResourceInner>() {
+               @Override
+               public SharedAccessAuthorizationRuleResourceInner call(SharedAccessAuthorizationRuleResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<SharedAccessAuthorizationRuleResourceInner> getInnerAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.getAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.authorizationRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createOrUpdateParameter = new SharedAccessAuthorizationRuleCreateOrUpdateParameters();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<AccessRights> rights() {
+        return this.inner().rights();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        this.eventHubName = eventHubName;
+        return this;
+    }
+
+    @Override
+    public EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl withRights(List<AccessRights> rights) {
+        this.createOrUpdateParameter.withRights(rights);
+        return this;
+    }
+
+    @Override
+    public EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl withLocation(String location) {
+        this.createOrUpdateParameter.withLocation(location);
+        return this;
+    }
+
+    @Override
+    public EventhubNamespaceSharedAccessAuthorizationRuleResourceImpl withName(String name) {
+        this.createOrUpdateParameter.withName(name);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/IdParsingUtils.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..2b2b39351f22
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/IdParsingUtils.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+import java.util.Arrays;
+import java.util.Iterator;
+
+class IdParsingUtils {
+    public static String getValueFromIdByName(String id, String name) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator<String> itr = iterable.iterator();
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (part.equalsIgnoreCase(name)) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getValueFromIdByPosition(String id, int pos) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator <String> itr = iterable.iterator();
+        int index = 0;
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (index == pos) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+            index++;
+        }
+        return null;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceResourceImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceResourceImpl.java
new file mode 100644
index 000000000000..26d079166f8e
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceResourceImpl.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceResource;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceUpdateParameter;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceCreateOrUpdateParameters;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Sku;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceState;
+import rx.functions.Func1;
+
+class NamespaceResourceImpl extends GroupableResourceCoreImpl<NamespaceResource, NamespaceResourceInner, NamespaceResourceImpl, EventHubManager> implements NamespaceResource, NamespaceResource.Definition, NamespaceResource.Update {
+    private NamespaceCreateOrUpdateParameters createParameter;
+    private NamespaceUpdateParameter updateParameter;
+    NamespaceResourceImpl(String name, NamespaceResourceInner inner, EventHubManager manager) {
+        super(name, inner, manager);
+        this.createParameter = new NamespaceCreateOrUpdateParameters();
+        this.updateParameter = new NamespaceUpdateParameter();
+    }
+
+    @Override
+    public Observable<NamespaceResource> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        this.createParameter.withLocation(inner().location());
+        this.createParameter.withTags(inner().getTags());
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.createParameter)
+            .map(new Func1<NamespaceResourceInner, NamespaceResourceInner>() {
+               @Override
+               public NamespaceResourceInner call(NamespaceResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NamespaceResource> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.updateAsync(this.resourceGroupName(), this.name(), this.updateParameter)
+            .map(new Func1<NamespaceResourceInner, NamespaceResourceInner>() {
+               @Override
+               public NamespaceResourceInner call(NamespaceResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<NamespaceResourceInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createParameter = new NamespaceCreateOrUpdateParameters();
+        this.updateParameter = new NamespaceUpdateParameter();
+    }
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public Boolean enabled() {
+        return this.inner().enabled();
+    }
+
+    @Override
+    public String metricId() {
+        return this.inner().metricId();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String serviceBusEndpoint() {
+        return this.inner().serviceBusEndpoint();
+    }
+
+    @Override
+    public Sku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public NamespaceState status() {
+        return this.inner().status();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public NamespaceResourceImpl withCreatedAt(DateTime createdAt) {
+        this.createParameter.withCreatedAt(createdAt);
+        return this;
+    }
+
+    @Override
+    public NamespaceResourceImpl withEnabled(Boolean enabled) {
+        this.createParameter.withEnabled(enabled);
+        return this;
+    }
+
+    @Override
+    public NamespaceResourceImpl withProvisioningState(String provisioningState) {
+        this.createParameter.withProvisioningState(provisioningState);
+        return this;
+    }
+
+    @Override
+    public NamespaceResourceImpl withServiceBusEndpoint(String serviceBusEndpoint) {
+        this.createParameter.withServiceBusEndpoint(serviceBusEndpoint);
+        return this;
+    }
+
+    @Override
+    public NamespaceResourceImpl withStatus(NamespaceState status) {
+        this.createParameter.withStatus(status);
+        return this;
+    }
+
+    @Override
+    public NamespaceResourceImpl withUpdatedAt(DateTime updatedAt) {
+        this.createParameter.withUpdatedAt(updatedAt);
+        return this;
+    }
+
+    @Override
+    public NamespaceResourceImpl withSku(Sku sku) {
+        if (isInCreateMode()) {
+            this.createParameter.withSku(sku);
+        } else {
+            this.updateParameter.withSku(sku);
+        }
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceResourceInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceResourceInner.java
new file mode 100644
index 000000000000..50f1d38da834
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceResourceInner.java
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.Sku;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceState;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Single Namespace item in List or Get Operation.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class NamespaceResourceInner extends Resource {
+    /**
+     * The sku property.
+     */
+    @JsonProperty(value = "sku")
+    private Sku sku;
+
+    /**
+     * State of the Namespace. Possible values include: 'Unknown', 'Creating',
+     * 'Created', 'Activating', 'Enabling', 'Active', 'Disabling', 'Disabled',
+     * 'SoftDeleting', 'SoftDeleted', 'Removing', 'Removed', 'Failed'.
+     */
+    @JsonProperty(value = "properties.status")
+    private NamespaceState status;
+
+    /**
+     * Provisioning state of the Namespace.
+     */
+    @JsonProperty(value = "properties.provisioningState")
+    private String provisioningState;
+
+    /**
+     * The time the Namespace was created.
+     */
+    @JsonProperty(value = "properties.createdAt")
+    private DateTime createdAt;
+
+    /**
+     * The time the Namespace was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt")
+    private DateTime updatedAt;
+
+    /**
+     * Endpoint you can use to perform Service Bus operations.
+     */
+    @JsonProperty(value = "properties.serviceBusEndpoint")
+    private String serviceBusEndpoint;
+
+    /**
+     * Identifier for Azure Insights metrics.
+     */
+    @JsonProperty(value = "properties.metricId", access = JsonProperty.Access.WRITE_ONLY)
+    private String metricId;
+
+    /**
+     * Specifies whether this instance is enabled.
+     */
+    @JsonProperty(value = "properties.enabled")
+    private Boolean enabled;
+
+    /**
+     * Get the sku value.
+     *
+     * @return the sku value
+     */
+    public Sku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the sku value.
+     *
+     * @param sku the sku value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withSku(Sku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get state of the Namespace. Possible values include: 'Unknown', 'Creating', 'Created', 'Activating', 'Enabling', 'Active', 'Disabling', 'Disabled', 'SoftDeleting', 'SoftDeleted', 'Removing', 'Removed', 'Failed'.
+     *
+     * @return the status value
+     */
+    public NamespaceState status() {
+        return this.status;
+    }
+
+    /**
+     * Set state of the Namespace. Possible values include: 'Unknown', 'Creating', 'Created', 'Activating', 'Enabling', 'Active', 'Disabling', 'Disabled', 'SoftDeleting', 'SoftDeleted', 'Removing', 'Removed', 'Failed'.
+     *
+     * @param status the status value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withStatus(NamespaceState status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get provisioning state of the Namespace.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set provisioning state of the Namespace.
+     *
+     * @param provisioningState the provisioningState value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withProvisioningState(String provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get the time the Namespace was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Set the time the Namespace was created.
+     *
+     * @param createdAt the createdAt value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withCreatedAt(DateTime createdAt) {
+        this.createdAt = createdAt;
+        return this;
+    }
+
+    /**
+     * Get the time the Namespace was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Set the time the Namespace was updated.
+     *
+     * @param updatedAt the updatedAt value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withUpdatedAt(DateTime updatedAt) {
+        this.updatedAt = updatedAt;
+        return this;
+    }
+
+    /**
+     * Get endpoint you can use to perform Service Bus operations.
+     *
+     * @return the serviceBusEndpoint value
+     */
+    public String serviceBusEndpoint() {
+        return this.serviceBusEndpoint;
+    }
+
+    /**
+     * Set endpoint you can use to perform Service Bus operations.
+     *
+     * @param serviceBusEndpoint the serviceBusEndpoint value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withServiceBusEndpoint(String serviceBusEndpoint) {
+        this.serviceBusEndpoint = serviceBusEndpoint;
+        return this;
+    }
+
+    /**
+     * Get identifier for Azure Insights metrics.
+     *
+     * @return the metricId value
+     */
+    public String metricId() {
+        return this.metricId;
+    }
+
+    /**
+     * Get specifies whether this instance is enabled.
+     *
+     * @return the enabled value
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set specifies whether this instance is enabled.
+     *
+     * @param enabled the enabled value to set
+     * @return the NamespaceResourceInner object itself.
+     */
+    public NamespaceResourceInner withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java
new file mode 100644
index 000000000000..3179454aca55
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceSharedAccessAuthorizationRuleResource;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2015_08_01.SharedAccessAuthorizationRuleCreateOrUpdateParameters;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2015_08_01.AccessRights;
+import rx.functions.Func1;
+
+class NamespaceSharedAccessAuthorizationRuleResourceImpl extends CreatableUpdatableImpl<NamespaceSharedAccessAuthorizationRuleResource, SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResourceImpl> implements NamespaceSharedAccessAuthorizationRuleResource, NamespaceSharedAccessAuthorizationRuleResource.Definition, NamespaceSharedAccessAuthorizationRuleResource.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String authorizationRuleName;
+    private SharedAccessAuthorizationRuleCreateOrUpdateParameters createOrUpdateParameter;
+
+    NamespaceSharedAccessAuthorizationRuleResourceImpl(String name, EventHubManager manager) {
+        super(name, new SharedAccessAuthorizationRuleResourceInner());
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = name;
+        //
+        this.createOrUpdateParameter = new SharedAccessAuthorizationRuleCreateOrUpdateParameters();
+    }
+
+    NamespaceSharedAccessAuthorizationRuleResourceImpl(SharedAccessAuthorizationRuleResourceInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "AuthorizationRules");
+        //
+        this.createOrUpdateParameter = new SharedAccessAuthorizationRuleCreateOrUpdateParameters();
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<NamespaceSharedAccessAuthorizationRuleResource> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.authorizationRuleName, this.createOrUpdateParameter)
+            .map(new Func1<SharedAccessAuthorizationRuleResourceInner, SharedAccessAuthorizationRuleResourceInner>() {
+               @Override
+               public SharedAccessAuthorizationRuleResourceInner call(SharedAccessAuthorizationRuleResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NamespaceSharedAccessAuthorizationRuleResource> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.authorizationRuleName, this.createOrUpdateParameter)
+            .map(new Func1<SharedAccessAuthorizationRuleResourceInner, SharedAccessAuthorizationRuleResourceInner>() {
+               @Override
+               public SharedAccessAuthorizationRuleResourceInner call(SharedAccessAuthorizationRuleResourceInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<SharedAccessAuthorizationRuleResourceInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.authorizationRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+    private void resetCreateUpdateParameters() {
+        this.createOrUpdateParameter = new SharedAccessAuthorizationRuleCreateOrUpdateParameters();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<AccessRights> rights() {
+        return this.inner().rights();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public NamespaceSharedAccessAuthorizationRuleResourceImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+    @Override
+    public NamespaceSharedAccessAuthorizationRuleResourceImpl withRights(List<AccessRights> rights) {
+        this.createOrUpdateParameter.withRights(rights);
+        return this;
+    }
+
+    @Override
+    public NamespaceSharedAccessAuthorizationRuleResourceImpl withLocation(String location) {
+        this.createOrUpdateParameter.withLocation(location);
+        return this;
+    }
+
+    @Override
+    public NamespaceSharedAccessAuthorizationRuleResourceImpl withName(String name) {
+        this.createOrUpdateParameter.withName(name);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespacesImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespacesImpl.java
new file mode 100644
index 000000000000..49edd0e2f6d2
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespacesImpl.java
@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * def
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Namespaces;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceResource;
+import rx.Observable;
+import rx.Completable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import com.microsoft.azure.arm.resources.ResourceUtilsCore;
+import com.microsoft.azure.arm.utils.RXMapper;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2015_08_01.CheckNameAvailabilityResult;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceSharedAccessAuthorizationRuleResource;
+import com.microsoft.azure.management.eventhub.v2015_08_01.ResourceListKeys;
+
+class NamespacesImpl extends GroupableResourcesCoreImpl<NamespaceResource, NamespaceResourceImpl, NamespaceResourceInner, NamespacesInner, EventHubManager>  implements Namespaces {
+    protected NamespacesImpl(EventHubManager manager) {
+        super(manager.inner().namespaces(), manager);
+    }
+
+    @Override
+    protected Observable<NamespaceResourceInner> getInnerAsync(String resourceGroupName, String name) {
+        NamespacesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NamespacesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(Collection<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Observable.empty();
+        }
+        Collection<Observable<String>> observables = new ArrayList<>();
+        for (String id : ids) {
+            final String resourceGroupName = ResourceUtilsCore.groupFromResourceId(id);
+            final String name = ResourceUtilsCore.nameFromResourceId(id);
+            Observable<String> o = RXMapper.map(this.inner().deleteAsync(resourceGroupName, name), id);
+            observables.add(o);
+        }
+        return Observable.mergeDelayError(observables);
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(String...ids) {
+        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public void deleteByIds(Collection<String> ids) {
+        if (ids != null && !ids.isEmpty()) {
+            this.deleteByIdsAsync(ids).toBlocking().last();
+        }
+    }
+
+    @Override
+    public void deleteByIds(String...ids) {
+        this.deleteByIds(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public PagedList<NamespaceResource> listByResourceGroup(String resourceGroupName) {
+        NamespacesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<NamespaceResource> listByResourceGroupAsync(String resourceGroupName) {
+        NamespacesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<NamespaceResourceInner>, Iterable<NamespaceResourceInner>>() {
+            @Override
+            public Iterable<NamespaceResourceInner> call(Page<NamespaceResourceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NamespaceResourceInner, NamespaceResource>() {
+            @Override
+            public NamespaceResource call(NamespaceResourceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<NamespaceResource> list() {
+        NamespacesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<NamespaceResource> listAsync() {
+        NamespacesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<NamespaceResourceInner>, Iterable<NamespaceResourceInner>>() {
+            @Override
+            public Iterable<NamespaceResourceInner> call(Page<NamespaceResourceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<NamespaceResourceInner, NamespaceResource>() {
+            @Override
+            public NamespaceResource call(NamespaceResourceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public NamespaceResourceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String name) {
+        NamespacesInner client = this.inner();
+        return client.checkNameAvailabilityAsync(name)
+        .map(new Func1<CheckNameAvailabilityResultInner, CheckNameAvailabilityResult>() {
+            @Override
+            public CheckNameAvailabilityResult call(CheckNameAvailabilityResultInner inner) {
+                return new CheckNameAvailabilityResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected NamespaceResourceImpl wrapModel(NamespaceResourceInner inner) {
+        return  new NamespaceResourceImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected NamespaceResourceImpl wrapModel(String name) {
+        return new NamespaceResourceImpl(name, new NamespaceResourceInner(), this.manager());
+    }
+
+    @Override
+    public NamespaceSharedAccessAuthorizationRuleResourceImpl defineAuthorizationRule(String name) {
+        return wrapAuthorizationRuleModel(name);
+    }
+
+    private NamespaceSharedAccessAuthorizationRuleResourceImpl wrapAuthorizationRuleModel(String name) {
+        return new NamespaceSharedAccessAuthorizationRuleResourceImpl(name, this.manager());
+    }
+
+    private NamespaceSharedAccessAuthorizationRuleResourceImpl wrapNamespaceSharedAccessAuthorizationRuleResourceModel(SharedAccessAuthorizationRuleResourceInner inner) {
+        return  new NamespaceSharedAccessAuthorizationRuleResourceImpl(inner, manager());
+    }
+
+    private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAuthorizationRuleResourceInnerUsingNamespacesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "AuthorizationRules");
+        NamespacesInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName);
+    }
+
+    @Override
+    public Observable<NamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        NamespacesInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName)
+        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
+            @Override
+            public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
+                return wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<NamespaceSharedAccessAuthorizationRuleResource> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.listAuthorizationRulesAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<SharedAccessAuthorizationRuleResourceInner>, Iterable<SharedAccessAuthorizationRuleResourceInner>>() {
+            @Override
+            public Iterable<SharedAccessAuthorizationRuleResourceInner> call(Page<SharedAccessAuthorizationRuleResourceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
+            @Override
+            public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
+                return wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        NamespacesInner client = this.inner();
+        return client.deleteAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName).toCompletable();
+    }
+
+    @Override
+    public Observable<ResourceListKeys> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        NamespacesInner client = this.inner();
+        return client.listKeysAsync(resourceGroupName, namespaceName, authorizationRuleName)
+        .map(new Func1<ResourceListKeysInner, ResourceListKeys>() {
+            @Override
+            public ResourceListKeys call(ResourceListKeysInner inner) {
+                return new ResourceListKeysImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceListKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        NamespacesInner client = this.inner();
+        return client.regenerateKeysAsync(resourceGroupName, namespaceName, authorizationRuleName)
+        .map(new Func1<ResourceListKeysInner, ResourceListKeys>() {
+            @Override
+            public ResourceListKeys call(ResourceListKeysInner inner) {
+                return new ResourceListKeysImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespacesInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespacesInner.java
new file mode 100644
index 000000000000..ab2ff6af6451
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/NamespacesInner.java
@@ -0,0 +1,1987 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2015_08_01.CheckNameAvailabilityParameter;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceCreateOrUpdateParameters;
+import com.microsoft.azure.management.eventhub.v2015_08_01.NamespaceUpdateParameter;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Policykey;
+import com.microsoft.azure.management.eventhub.v2015_08_01.RegenerateKeysParameters;
+import com.microsoft.azure.management.eventhub.v2015_08_01.SharedAccessAuthorizationRuleCreateOrUpdateParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Namespaces.
+ */
+public class NamespacesInner implements InnerSupportsGet<NamespaceResourceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<NamespaceResourceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NamespacesService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NamespacesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NamespacesInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(NamespacesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Namespaces to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NamespacesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.Namespaces checkNameAvailability" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.EventHub/CheckNameAvailability")
+        Observable<Response<ResponseBody>> checkNameAvailability(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckNameAvailabilityParameter parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.Namespaces list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.EventHub/namespaces")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2015_08_01.Namespaces listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @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.eventhub.v2015_08_01.Namespaces createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body NamespaceCreateOrUpdateParameters parameters, @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.eventhub.v2015_08_01.Namespaces beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body NamespaceCreateOrUpdateParameters parameters, @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.eventhub.v2015_08_01.Namespaces delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@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.eventhub.v2015_08_01.Namespaces beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@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.eventhub.v2015_08_01.Namespaces getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@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.eventhub.v2015_08_01.Namespaces update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> update(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body NamespaceUpdateParameter parameters, @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.eventhub.v2015_08_01.Namespaces listAuthorizationRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules")
+        Observable<Response<ResponseBody>> listAuthorizationRules(@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.eventhub.v2015_08_01.Namespaces createOrUpdateAuthorizationRule" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdateAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Body SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters, @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.eventhub.v2015_08_01.Namespaces deleteAuthorizationRule" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.Namespaces getAuthorizationRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> getAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.Namespaces listKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/listKeys")
+        Observable<Response<ResponseBody>> listKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2015_08_01.Namespaces regenerateKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/regenerateKeys")
+        Observable<Response<ResponseBody>> regenerateKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body RegenerateKeysParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.Namespaces listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@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.eventhub.v2015_08_01.Namespaces listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@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.eventhub.v2015_08_01.Namespaces listAuthorizationRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAuthorizationRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the CheckNameAvailabilityResultInner object if successful.
+     */
+    public CheckNameAvailabilityResultInner checkNameAvailability(String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(name).toBlocking().single().body();
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @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<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String name, final ServiceCallback<CheckNameAvailabilityResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkNameAvailabilityWithServiceResponseAsync(name), serviceCallback);
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(name).map(new Func1<ServiceResponse<CheckNameAvailabilityResultInner>, CheckNameAvailabilityResultInner>() {
+            @Override
+            public CheckNameAvailabilityResultInner call(ServiceResponse<CheckNameAvailabilityResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> checkNameAvailabilityWithServiceResponseAsync(String name) {
+        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.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        CheckNameAvailabilityParameter parameters = new CheckNameAvailabilityParameter();
+        parameters.withName(name);
+        return service.checkNameAvailability(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CheckNameAvailabilityResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CheckNameAvailabilityResultInner> clientResponse = checkNameAvailabilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CheckNameAvailabilityResultInner> checkNameAvailabilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CheckNameAvailabilityResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CheckNameAvailabilityResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;NamespaceResourceInner&gt; object if successful.
+     */
+    public PagedList<NamespaceResourceInner> list() {
+        ServiceResponse<Page<NamespaceResourceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<NamespaceResourceInner>(response.body()) {
+            @Override
+            public Page<NamespaceResourceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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<NamespaceResourceInner>> listAsync(final ListOperationCallback<NamespaceResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NamespaceResourceInner&gt; object
+     */
+    public Observable<Page<NamespaceResourceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Page<NamespaceResourceInner>>() {
+                @Override
+                public Page<NamespaceResourceInner> call(ServiceResponse<Page<NamespaceResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NamespaceResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(ServiceResponse<Page<NamespaceResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NamespaceResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listSinglePageAsync() {
+        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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NamespaceResourceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NamespaceResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NamespaceResourceInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NamespaceResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NamespaceResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;NamespaceResourceInner&gt; object if successful.
+     */
+    public PagedList<NamespaceResourceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<NamespaceResourceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<NamespaceResourceInner>(response.body()) {
+            @Override
+            public Page<NamespaceResourceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @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<NamespaceResourceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<NamespaceResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NamespaceResourceInner&gt; object
+     */
+    public Observable<Page<NamespaceResourceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Page<NamespaceResourceInner>>() {
+                @Override
+                public Page<NamespaceResourceInner> call(ServiceResponse<Page<NamespaceResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;NamespaceResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(ServiceResponse<Page<NamespaceResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+    ServiceResponse<PageImpl<NamespaceResourceInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NamespaceResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName 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.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NamespaceResourceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NamespaceResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NamespaceResourceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NamespaceResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NamespaceResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the NamespaceResourceInner object if successful.
+     */
+    public NamespaceResourceInner createOrUpdate(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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<NamespaceResourceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters, final ServiceCallback<NamespaceResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NamespaceResourceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<NamespaceResourceInner>, NamespaceResourceInner>() {
+            @Override
+            public NamespaceResourceInner call(ServiceResponse<NamespaceResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NamespaceResourceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<NamespaceResourceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the NamespaceResourceInner object if successful.
+     */
+    public NamespaceResourceInner beginCreateOrUpdate(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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<NamespaceResourceInner> beginCreateOrUpdateAsync(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters, final ServiceCallback<NamespaceResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NamespaceResourceInner object
+     */
+    public Observable<NamespaceResourceInner> beginCreateOrUpdateAsync(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<NamespaceResourceInner>, NamespaceResourceInner>() {
+            @Override
+            public NamespaceResourceInner call(ServiceResponse<NamespaceResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NamespaceResourceInner object
+     */
+    public Observable<ServiceResponse<NamespaceResourceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, NamespaceCreateOrUpdateParameters parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreateOrUpdate(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NamespaceResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NamespaceResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NamespaceResourceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NamespaceResourceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NamespaceResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NamespaceResourceInner>() { }.getType())
+                .register(201, new TypeToken<NamespaceResourceInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String namespaceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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<Void> deleteAsync(String resourceGroupName, String namespaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, 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.");
+        }
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDelete(String resourceGroupName, String namespaceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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<Void> beginDeleteAsync(String resourceGroupName, String namespaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String namespaceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, 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.beginDelete(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the description of the specified 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 CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the NamespaceResourceInner object if successful.
+     */
+    public NamespaceResourceInner getByResourceGroup(String resourceGroupName, String namespaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the description of the specified 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<NamespaceResourceInner> getByResourceGroupAsync(String resourceGroupName, String namespaceName, final ServiceCallback<NamespaceResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Gets the description of the specified 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 NamespaceResourceInner object
+     */
+    public Observable<NamespaceResourceInner> getByResourceGroupAsync(String resourceGroupName, String namespaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<NamespaceResourceInner>, NamespaceResourceInner>() {
+            @Override
+            public NamespaceResourceInner call(ServiceResponse<NamespaceResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the description of the specified 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 NamespaceResourceInner object
+     */
+    public Observable<ServiceResponse<NamespaceResourceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, 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.getByResourceGroup(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NamespaceResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NamespaceResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NamespaceResourceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NamespaceResourceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NamespaceResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NamespaceResourceInner>() { }.getType())
+                .register(201, new TypeToken<NamespaceResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the NamespaceResourceInner object if successful.
+     */
+    public NamespaceResourceInner update(String resourceGroupName, String namespaceName, NamespaceUpdateParameter parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @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<NamespaceResourceInner> updateAsync(String resourceGroupName, String namespaceName, NamespaceUpdateParameter parameters, final ServiceCallback<NamespaceResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NamespaceResourceInner object
+     */
+    public Observable<NamespaceResourceInner> updateAsync(String resourceGroupName, String namespaceName, NamespaceUpdateParameter parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<NamespaceResourceInner>, NamespaceResourceInner>() {
+            @Override
+            public NamespaceResourceInner call(ServiceResponse<NamespaceResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NamespaceResourceInner object
+     */
+    public Observable<ServiceResponse<NamespaceResourceInner>> updateWithServiceResponseAsync(String resourceGroupName, String namespaceName, NamespaceUpdateParameter parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.update(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NamespaceResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NamespaceResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NamespaceResourceInner> clientResponse = updateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NamespaceResourceInner> updateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NamespaceResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NamespaceResourceInner>() { }.getType())
+                .register(201, new TypeToken<NamespaceResourceInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of authorization rules 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 CloudException 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;SharedAccessAuthorizationRuleResourceInner&gt; object if successful.
+     */
+    public PagedList<SharedAccessAuthorizationRuleResourceInner> listAuthorizationRules(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response = listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<SharedAccessAuthorizationRuleResourceInner>(response.body()) {
+            @Override
+            public Page<SharedAccessAuthorizationRuleResourceInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of authorization rules 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<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<Page<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName) {
+        return listAuthorizationRulesWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Page<SharedAccessAuthorizationRuleResourceInner>>() {
+                @Override
+                public Page<SharedAccessAuthorizationRuleResourceInner> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules 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;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SharedAccessAuthorizationRuleResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesSinglePageAsync(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.listAuthorizationRules(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> result = listAuthorizationRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SharedAccessAuthorizationRuleResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SharedAccessAuthorizationRuleResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SharedAccessAuthorizationRuleResourceInner object if successful.
+     */
+    public SharedAccessAuthorizationRuleResourceInner createOrUpdateAuthorizationRule(String resourceGroupName, String namespaceName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @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<SharedAccessAuthorizationRuleResourceInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<SharedAccessAuthorizationRuleResourceInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
+            @Override
+            public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAccessAuthorizationRuleResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters The shared access AuthorizationRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> createOrUpdateAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, SharedAccessAuthorizationRuleCreateOrUpdateParameters parameters) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdateAuthorizationRule(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = createOrUpdateAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> createOrUpdateAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SharedAccessAuthorizationRuleResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SharedAccessAuthorizationRuleResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void deleteAuthorizationRule(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.deleteAuthorizationRule(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SharedAccessAuthorizationRuleResourceInner object if successful.
+     */
+    public SharedAccessAuthorizationRuleResourceInner getAuthorizationRule(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<SharedAccessAuthorizationRuleResourceInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<SharedAccessAuthorizationRuleResourceInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
+            @Override
+            public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAccessAuthorizationRuleResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SharedAccessAuthorizationRuleResourceInner object
+     */
+    public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> getAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.getAuthorizationRule(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = getAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> getAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SharedAccessAuthorizationRuleResourceInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SharedAccessAuthorizationRuleResourceInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceListKeysInner object if successful.
+     */
+    public ResourceListKeysInner listKeys(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<ResourceListKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<ResourceListKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ResourceListKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<ResourceListKeysInner>, ResourceListKeysInner>() {
+            @Override
+            public ResourceListKeysInner call(ServiceResponse<ResourceListKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ServiceResponse<ResourceListKeysInner>> listKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.listKeys(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceListKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceListKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceListKeysInner> clientResponse = listKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceListKeysInner> listKeysDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceListKeysInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceListKeysInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceListKeysInner object if successful.
+     */
+    public ResourceListKeysInner regenerateKeys(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<ResourceListKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<ResourceListKeysInner>, ResourceListKeysInner>() {
+            @Override
+            public ResourceListKeysInner call(ServiceResponse<ResourceListKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ServiceResponse<ResourceListKeysInner>> regenerateKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.");
+        }
+        final Policykey policykey = null;
+        RegenerateKeysParameters parameters = new RegenerateKeysParameters();
+        parameters.withPolicykey(null);
+        return service.regenerateKeys(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceListKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceListKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceListKeysInner> clientResponse = regenerateKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceListKeysInner object if successful.
+     */
+    public ResourceListKeysInner regenerateKeys(String resourceGroupName, String namespaceName, String authorizationRuleName, Policykey policykey) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, policykey).toBlocking().single().body();
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @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<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, Policykey policykey, final ServiceCallback<ResourceListKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, policykey), serviceCallback);
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ResourceListKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, Policykey policykey) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, policykey).map(new Func1<ServiceResponse<ResourceListKeysInner>, ResourceListKeysInner>() {
+            @Override
+            public ResourceListKeysInner call(ServiceResponse<ResourceListKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param policykey Key that needs to be regenerated. Possible values include: 'PrimaryKey', 'SecondaryKey'
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceListKeysInner object
+     */
+    public Observable<ServiceResponse<ResourceListKeysInner>> regenerateKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, Policykey policykey) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.");
+        }
+        RegenerateKeysParameters parameters = new RegenerateKeysParameters();
+        parameters.withPolicykey(policykey);
+        return service.regenerateKeys(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceListKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceListKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceListKeysInner> clientResponse = regenerateKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceListKeysInner> regenerateKeysDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceListKeysInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceListKeysInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;NamespaceResourceInner&gt; object if successful.
+     */
+    public PagedList<NamespaceResourceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<NamespaceResourceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NamespaceResourceInner>(response.body()) {
+            @Override
+            public Page<NamespaceResourceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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<NamespaceResourceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<NamespaceResourceInner>> serviceFuture, final ListOperationCallback<NamespaceResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;NamespaceResourceInner&gt; object
+     */
+    public Observable<Page<NamespaceResourceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Page<NamespaceResourceInner>>() {
+                @Override
+                public Page<NamespaceResourceInner> call(ServiceResponse<Page<NamespaceResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;NamespaceResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(ServiceResponse<Page<NamespaceResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+    ServiceResponse<PageImpl<NamespaceResourceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NamespaceResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NamespaceResourceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NamespaceResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NamespaceResourceInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NamespaceResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NamespaceResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;NamespaceResourceInner&gt; object if successful.
+     */
+    public PagedList<NamespaceResourceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<NamespaceResourceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<NamespaceResourceInner>(response.body()) {
+            @Override
+            public Page<NamespaceResourceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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<NamespaceResourceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<NamespaceResourceInner>> serviceFuture, final ListOperationCallback<NamespaceResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;NamespaceResourceInner&gt; object
+     */
+    public Observable<Page<NamespaceResourceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Page<NamespaceResourceInner>>() {
+                @Override
+                public Page<NamespaceResourceInner> call(ServiceResponse<Page<NamespaceResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;NamespaceResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<NamespaceResourceInner>>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(ServiceResponse<Page<NamespaceResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+    ServiceResponse<PageImpl<NamespaceResourceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;NamespaceResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<NamespaceResourceInner>>> listByResourceGroupNextSinglePageAsync(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.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<NamespaceResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<NamespaceResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<NamespaceResourceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<NamespaceResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<NamespaceResourceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<NamespaceResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<NamespaceResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;SharedAccessAuthorizationRuleResourceInner&gt; object if successful.
+     */
+    public PagedList<SharedAccessAuthorizationRuleResourceInner> listAuthorizationRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response = listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<SharedAccessAuthorizationRuleResourceInner>(response.body()) {
+            @Override
+            public Page<SharedAccessAuthorizationRuleResourceInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of authorization rules 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<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesNextAsync(final String nextPageLink, final ServiceFuture<List<SharedAccessAuthorizationRuleResourceInner>> serviceFuture, final ListOperationCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<Page<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesNextAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Page<SharedAccessAuthorizationRuleResourceInner>>() {
+                @Override
+                public Page<SharedAccessAuthorizationRuleResourceInner> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules 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;SharedAccessAuthorizationRuleResourceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;SharedAccessAuthorizationRuleResourceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> listAuthorizationRulesNextSinglePageAsync(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.listAuthorizationRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> result = listAuthorizationRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<SharedAccessAuthorizationRuleResourceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<SharedAccessAuthorizationRuleResourceInner>> listAuthorizationRulesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SharedAccessAuthorizationRuleResourceInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SharedAccessAuthorizationRuleResourceInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationImpl.java
new file mode 100644
index 000000000000..81ba8ee60b27
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.Operation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.OperationDisplay;
+
+class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
+    private final EventHubManager manager;
+    OperationImpl(OperationInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public OperationDisplay display() {
+        return this.inner().display();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationInner.java
new file mode 100644
index 000000000000..f8310ce74e81
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationInner.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.OperationDisplay;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Event Hub REST API operation.
+ */
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The object that represents the operation.
+     */
+    @JsonProperty(value = "display")
+    private OperationDisplay display;
+
+    /**
+     * Get operation name: {provider}/{resource}/{operation}.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the object that represents the operation.
+     *
+     * @return the display value
+     */
+    public OperationDisplay display() {
+        return this.display;
+    }
+
+    /**
+     * Set the object that represents the operation.
+     *
+     * @param display the display value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withDisplay(OperationDisplay display) {
+        this.display = display;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationsImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationsImpl.java
new file mode 100644
index 000000000000..c07e96c99431
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationsImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Operations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2015_08_01.Operation;
+
+class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
+    private final EventHubManager manager;
+
+    OperationsImpl(EventHubManager manager) {
+        super(manager.inner().operations());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<Operation> listAsync() {
+        OperationsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<OperationInner>, Iterable<OperationInner>>() {
+            @Override
+            public Iterable<OperationInner> call(Page<OperationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<OperationInner, Operation>() {
+            @Override
+            public Operation call(OperationInner inner) {
+                return new OperationImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationsInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationsInner.java
new file mode 100644
index 000000000000..7577a9237a58
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/OperationsInner.java
@@ -0,0 +1,283 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Operations.
+ */
+public class OperationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private OperationsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of OperationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public OperationsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(OperationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Operations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface OperationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2015_08_01.Operations list" })
+        @GET("providers/Microsoft.EventHub/operations")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2015_08_01.Operations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> list() {
+        ServiceResponse<Page<OperationInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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<OperationInner>> listAsync(final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listSinglePageAsync() {
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.list(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws CloudException 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;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<OperationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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<OperationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<OperationInner>> serviceFuture, final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+    ServiceResponse<PageImpl<OperationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/PageImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/PageImpl.java
new file mode 100644
index 000000000000..434953a31294
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/PageImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ResourceListKeysImpl.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ResourceListKeysImpl.java
new file mode 100644
index 000000000000..7c528a67e01a
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ResourceListKeysImpl.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2015_08_01.ResourceListKeys;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class ResourceListKeysImpl extends WrapperImpl<ResourceListKeysInner> implements ResourceListKeys {
+    private final EventHubManager manager;
+    ResourceListKeysImpl(ResourceListKeysInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String keyName() {
+        return this.inner().keyName();
+    }
+
+    @Override
+    public String primaryConnectionString() {
+        return this.inner().primaryConnectionString();
+    }
+
+    @Override
+    public String primaryKey() {
+        return this.inner().primaryKey();
+    }
+
+    @Override
+    public String secondaryConnectionString() {
+        return this.inner().secondaryConnectionString();
+    }
+
+    @Override
+    public String secondaryKey() {
+        return this.inner().secondaryKey();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ResourceListKeysInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ResourceListKeysInner.java
new file mode 100644
index 000000000000..7b59fc23847c
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/ResourceListKeysInner.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Namespace/EventHub Connection String.
+ */
+public class ResourceListKeysInner {
+    /**
+     * Primary connection string of the created Namespace AuthorizationRule.
+     */
+    @JsonProperty(value = "primaryConnectionString", access = JsonProperty.Access.WRITE_ONLY)
+    private String primaryConnectionString;
+
+    /**
+     * Secondary connection string of the created Namespace AuthorizationRule.
+     */
+    @JsonProperty(value = "secondaryConnectionString", access = JsonProperty.Access.WRITE_ONLY)
+    private String secondaryConnectionString;
+
+    /**
+     * A base64-encoded 256-bit primary key for signing and validating the SAS
+     * token.
+     */
+    @JsonProperty(value = "primaryKey", access = JsonProperty.Access.WRITE_ONLY)
+    private String primaryKey;
+
+    /**
+     * A base64-encoded 256-bit primary key for signing and validating the SAS
+     * token.
+     */
+    @JsonProperty(value = "secondaryKey", access = JsonProperty.Access.WRITE_ONLY)
+    private String secondaryKey;
+
+    /**
+     * A string that describes the AuthorizationRule.
+     */
+    @JsonProperty(value = "keyName", access = JsonProperty.Access.WRITE_ONLY)
+    private String keyName;
+
+    /**
+     * Get primary connection string of the created Namespace AuthorizationRule.
+     *
+     * @return the primaryConnectionString value
+     */
+    public String primaryConnectionString() {
+        return this.primaryConnectionString;
+    }
+
+    /**
+     * Get secondary connection string of the created Namespace AuthorizationRule.
+     *
+     * @return the secondaryConnectionString value
+     */
+    public String secondaryConnectionString() {
+        return this.secondaryConnectionString;
+    }
+
+    /**
+     * Get a base64-encoded 256-bit primary key for signing and validating the SAS token.
+     *
+     * @return the primaryKey value
+     */
+    public String primaryKey() {
+        return this.primaryKey;
+    }
+
+    /**
+     * Get a base64-encoded 256-bit primary key for signing and validating the SAS token.
+     *
+     * @return the secondaryKey value
+     */
+    public String secondaryKey() {
+        return this.secondaryKey;
+    }
+
+    /**
+     * Get a string that describes the AuthorizationRule.
+     *
+     * @return the keyName value
+     */
+    public String keyName() {
+        return this.keyName;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/SharedAccessAuthorizationRuleResourceInner.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/SharedAccessAuthorizationRuleResourceInner.java
new file mode 100644
index 000000000000..c761d57c11ba
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/SharedAccessAuthorizationRuleResourceInner.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2015_08_01.AccessRights;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in a List or Get AuthorizationRule operation.
+ */
+@JsonFlatten
+public class SharedAccessAuthorizationRuleResourceInner extends ProxyResource {
+    /**
+     * The rights associated with the rule.
+     */
+    @JsonProperty(value = "properties.rights", required = true)
+    private List<AccessRights> rights;
+
+    /**
+     * Resource location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Get the rights associated with the rule.
+     *
+     * @return the rights value
+     */
+    public List<AccessRights> rights() {
+        return this.rights;
+    }
+
+    /**
+     * Set the rights associated with the rule.
+     *
+     * @param rights the rights value to set
+     * @return the SharedAccessAuthorizationRuleResourceInner object itself.
+     */
+    public SharedAccessAuthorizationRuleResourceInner withRights(List<AccessRights> rights) {
+        this.rights = rights;
+        return this;
+    }
+
+    /**
+     * Get resource location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set resource location.
+     *
+     * @param location the location value to set
+     * @return the SharedAccessAuthorizationRuleResourceInner object itself.
+     */
+    public SharedAccessAuthorizationRuleResourceInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/package-info.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/package-info.java
new file mode 100644
index 000000000000..705dd1989c84
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/implementation/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the implementation classes for EventHubManagementClient.
+ * Azure Event Hubs client.
+ */
+package com.microsoft.azure.management.eventhub.v2015_08_01.implementation;
diff --git a/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/package-info.java b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/package-info.java
new file mode 100644
index 000000000000..26524409c943
--- /dev/null
+++ b/eventhub/resource-manager/v2015_08_01/src/main/java/com/microsoft/azure/management/eventhub/v2015_08_01/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the classes for EventHubManagementClient.
+ * Azure Event Hubs client.
+ */
+package com.microsoft.azure.management.eventhub.v2015_08_01;
diff --git a/eventhub/resource-manager/v2017_04_01/pom.xml b/eventhub/resource-manager/v2017_04_01/pom.xml
new file mode 100644
index 000000000000..bcafb74753a9
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/pom.xml
@@ -0,0 +1,133 @@
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.eventhub.v2017_04_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-eventhub</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for EventHub Management</name>
+    <description>This package contains Microsoft EventHub Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/AccessKeys.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/AccessKeys.java
new file mode 100644
index 000000000000..1b39714c5c95
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/AccessKeys.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.AccessKeysInner;
+
+/**
+ * Type representing AccessKeys.
+ */
+public interface AccessKeys extends HasInner<AccessKeysInner>, HasManager<EventHubManager> {
+    /**
+     * @return the aliasPrimaryConnectionString value.
+     */
+    String aliasPrimaryConnectionString();
+
+    /**
+     * @return the aliasSecondaryConnectionString value.
+     */
+    String aliasSecondaryConnectionString();
+
+    /**
+     * @return the keyName value.
+     */
+    String keyName();
+
+    /**
+     * @return the primaryConnectionString value.
+     */
+    String primaryConnectionString();
+
+    /**
+     * @return the primaryKey value.
+     */
+    String primaryKey();
+
+    /**
+     * @return the secondaryConnectionString value.
+     */
+    String secondaryConnectionString();
+
+    /**
+     * @return the secondaryKey value.
+     */
+    String secondaryKey();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/AccessRights.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/AccessRights.java
new file mode 100644
index 000000000000..22a9d0697100
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/AccessRights.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AccessRights.
+ */
+public final class AccessRights extends ExpandableStringEnum<AccessRights> {
+    /** Static value Manage for AccessRights. */
+    public static final AccessRights MANAGE = fromString("Manage");
+
+    /** Static value Send for AccessRights. */
+    public static final AccessRights SEND = fromString("Send");
+
+    /** Static value Listen for AccessRights. */
+    public static final AccessRights LISTEN = fromString("Listen");
+
+    /**
+     * Creates or finds a AccessRights from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AccessRights
+     */
+    @JsonCreator
+    public static AccessRights fromString(String name) {
+        return fromString(name, AccessRights.class);
+    }
+
+    /**
+     * @return known AccessRights values
+     */
+    public static Collection<AccessRights> values() {
+        return values(AccessRights.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ArmDisasterRecovery.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ArmDisasterRecovery.java
new file mode 100644
index 000000000000..6f3f8053d535
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ArmDisasterRecovery.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.ArmDisasterRecoveryInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+
+/**
+ * Type representing ArmDisasterRecovery.
+ */
+public interface ArmDisasterRecovery extends HasInner<ArmDisasterRecoveryInner>, Indexable, Refreshable<ArmDisasterRecovery>, Updatable<ArmDisasterRecovery.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the alternateName value.
+     */
+    String alternateName();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the partnerNamespace value.
+     */
+    String partnerNamespace();
+
+    /**
+     * @return the pendingReplicationOperationsCount value.
+     */
+    Long pendingReplicationOperationsCount();
+
+    /**
+     * @return the provisioningState value.
+     */
+    ProvisioningStateDR provisioningState();
+
+    /**
+     * @return the role value.
+     */
+    RoleDisasterRecovery role();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the ArmDisasterRecovery definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ArmDisasterRecovery definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ArmDisasterRecovery definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the armdisasterrecovery definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithCreate withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the armdisasterrecovery definition allowing to specify AlternateName.
+         */
+        interface WithAlternateName {
+            /**
+             * Specifies alternateName.
+             */
+            WithCreate withAlternateName(String alternateName);
+        }
+
+        /**
+         * The stage of the armdisasterrecovery definition allowing to specify PartnerNamespace.
+         */
+        interface WithPartnerNamespace {
+            /**
+             * Specifies partnerNamespace.
+             */
+            WithCreate withPartnerNamespace(String partnerNamespace);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<ArmDisasterRecovery>, DefinitionStages.WithAlternateName, DefinitionStages.WithPartnerNamespace {
+        }
+    }
+    /**
+     * The template for a ArmDisasterRecovery update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ArmDisasterRecovery>, UpdateStages.WithAlternateName, UpdateStages.WithPartnerNamespace {
+    }
+
+    /**
+     * Grouping of ArmDisasterRecovery update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the armdisasterrecovery update allowing to specify AlternateName.
+         */
+        interface WithAlternateName {
+            /**
+             * Specifies alternateName.
+             */
+            Update withAlternateName(String alternateName);
+        }
+
+        /**
+         * The stage of the armdisasterrecovery update allowing to specify PartnerNamespace.
+         */
+        interface WithPartnerNamespace {
+            /**
+             * Specifies partnerNamespace.
+             */
+            Update withPartnerNamespace(String partnerNamespace);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CaptureDescription.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CaptureDescription.java
new file mode 100644
index 000000000000..2f182a421b64
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CaptureDescription.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties to configure capture description for eventhub.
+ */
+public class CaptureDescription {
+    /**
+     * A value that indicates whether capture description is enabled.
+     */
+    @JsonProperty(value = "enabled")
+    private Boolean enabled;
+
+    /**
+     * Enumerates the possible values for the encoding format of capture
+     * description. Note: 'AvroDeflate' will be deprecated in New API Version.
+     * Possible values include: 'Avro', 'AvroDeflate'.
+     */
+    @JsonProperty(value = "encoding")
+    private EncodingCaptureDescription encoding;
+
+    /**
+     * The time window allows you to set the frequency with which the capture
+     * to Azure Blobs will happen, value should between 60 to 900 seconds.
+     */
+    @JsonProperty(value = "intervalInSeconds")
+    private Integer intervalInSeconds;
+
+    /**
+     * The size window defines the amount of data built up in your Event Hub
+     * before an capture operation, value should be between 10485760 to
+     * 524288000 bytes.
+     */
+    @JsonProperty(value = "sizeLimitInBytes")
+    private Integer sizeLimitInBytes;
+
+    /**
+     * Properties of Destination where capture will be stored. (Storage
+     * Account, Blob Names).
+     */
+    @JsonProperty(value = "destination")
+    private Destination destination;
+
+    /**
+     * A value that indicates whether to Skip Empty Archives.
+     */
+    @JsonProperty(value = "skipEmptyArchives")
+    private Boolean skipEmptyArchives;
+
+    /**
+     * Get a value that indicates whether capture description is enabled.
+     *
+     * @return the enabled value
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set a value that indicates whether capture description is enabled.
+     *
+     * @param enabled the enabled value to set
+     * @return the CaptureDescription object itself.
+     */
+    public CaptureDescription withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get enumerates the possible values for the encoding format of capture description. Note: 'AvroDeflate' will be deprecated in New API Version. Possible values include: 'Avro', 'AvroDeflate'.
+     *
+     * @return the encoding value
+     */
+    public EncodingCaptureDescription encoding() {
+        return this.encoding;
+    }
+
+    /**
+     * Set enumerates the possible values for the encoding format of capture description. Note: 'AvroDeflate' will be deprecated in New API Version. Possible values include: 'Avro', 'AvroDeflate'.
+     *
+     * @param encoding the encoding value to set
+     * @return the CaptureDescription object itself.
+     */
+    public CaptureDescription withEncoding(EncodingCaptureDescription encoding) {
+        this.encoding = encoding;
+        return this;
+    }
+
+    /**
+     * Get the time window allows you to set the frequency with which the capture to Azure Blobs will happen, value should between 60 to 900 seconds.
+     *
+     * @return the intervalInSeconds value
+     */
+    public Integer intervalInSeconds() {
+        return this.intervalInSeconds;
+    }
+
+    /**
+     * Set the time window allows you to set the frequency with which the capture to Azure Blobs will happen, value should between 60 to 900 seconds.
+     *
+     * @param intervalInSeconds the intervalInSeconds value to set
+     * @return the CaptureDescription object itself.
+     */
+    public CaptureDescription withIntervalInSeconds(Integer intervalInSeconds) {
+        this.intervalInSeconds = intervalInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the size window defines the amount of data built up in your Event Hub before an capture operation, value should be between 10485760 to 524288000 bytes.
+     *
+     * @return the sizeLimitInBytes value
+     */
+    public Integer sizeLimitInBytes() {
+        return this.sizeLimitInBytes;
+    }
+
+    /**
+     * Set the size window defines the amount of data built up in your Event Hub before an capture operation, value should be between 10485760 to 524288000 bytes.
+     *
+     * @param sizeLimitInBytes the sizeLimitInBytes value to set
+     * @return the CaptureDescription object itself.
+     */
+    public CaptureDescription withSizeLimitInBytes(Integer sizeLimitInBytes) {
+        this.sizeLimitInBytes = sizeLimitInBytes;
+        return this;
+    }
+
+    /**
+     * Get properties of Destination where capture will be stored. (Storage Account, Blob Names).
+     *
+     * @return the destination value
+     */
+    public Destination destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set properties of Destination where capture will be stored. (Storage Account, Blob Names).
+     *
+     * @param destination the destination value to set
+     * @return the CaptureDescription object itself.
+     */
+    public CaptureDescription withDestination(Destination destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get a value that indicates whether to Skip Empty Archives.
+     *
+     * @return the skipEmptyArchives value
+     */
+    public Boolean skipEmptyArchives() {
+        return this.skipEmptyArchives;
+    }
+
+    /**
+     * Set a value that indicates whether to Skip Empty Archives.
+     *
+     * @param skipEmptyArchives the skipEmptyArchives value to set
+     * @return the CaptureDescription object itself.
+     */
+    public CaptureDescription withSkipEmptyArchives(Boolean skipEmptyArchives) {
+        this.skipEmptyArchives = skipEmptyArchives;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CheckNameAvailabilityParameter.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CheckNameAvailabilityParameter.java
new file mode 100644
index 000000000000..c3fcd9dd1d26
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CheckNameAvailabilityParameter.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameter supplied to check Namespace name availability operation.
+ */
+public class CheckNameAvailabilityParameter {
+    /**
+     * Name to check the namespace name availability.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Get name to check the namespace name availability.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name to check the namespace name availability.
+     *
+     * @param name the name value to set
+     * @return the CheckNameAvailabilityParameter object itself.
+     */
+    public CheckNameAvailabilityParameter withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CheckNameAvailabilityResult.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CheckNameAvailabilityResult.java
new file mode 100644
index 000000000000..af640139ed6f
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/CheckNameAvailabilityResult.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.CheckNameAvailabilityResultInner;
+
+/**
+ * Type representing CheckNameAvailabilityResult.
+ */
+public interface CheckNameAvailabilityResult extends HasInner<CheckNameAvailabilityResultInner>, HasManager<EventHubManager> {
+    /**
+     * @return the message value.
+     */
+    String message();
+
+    /**
+     * @return the nameAvailable value.
+     */
+    Boolean nameAvailable();
+
+    /**
+     * @return the reason value.
+     */
+    UnavailableReason reason();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ConsumerGroup.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ConsumerGroup.java
new file mode 100644
index 000000000000..54d9c571c3ca
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ConsumerGroup.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.ConsumerGroupInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing ConsumerGroup.
+ */
+public interface ConsumerGroup extends HasInner<ConsumerGroupInner>, Indexable, Refreshable<ConsumerGroup>, Updatable<ConsumerGroup.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * @return the userMetadata value.
+     */
+    String userMetadata();
+
+    /**
+     * The entirety of the ConsumerGroup definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithEventhub, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ConsumerGroup definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ConsumerGroup definition.
+         */
+        interface Blank extends WithEventhub {
+        }
+
+        /**
+         * The stage of the consumergroup definition allowing to specify Eventhub.
+         */
+        interface WithEventhub {
+           /**
+            * Specifies resourceGroupName, namespaceName, eventHubName.
+            */
+            WithCreate withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<ConsumerGroup> {
+        }
+    }
+    /**
+     * The template for a ConsumerGroup update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ConsumerGroup> {
+    }
+
+    /**
+     * Grouping of ConsumerGroup update stages.
+     */
+    interface UpdateStages {
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ConsumerGroups.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ConsumerGroups.java
new file mode 100644
index 000000000000..061e23cb420e
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ConsumerGroups.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.ConsumerGroupsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ConsumerGroups.
+ */
+public interface ConsumerGroups extends SupportsCreating<ConsumerGroup.DefinitionStages.Blank>, HasInner<ConsumerGroupsInner> {
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConsumerGroup> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName);
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ConsumerGroup> listByEventHubAsync(final String resourceGroupName, final String namespaceName, final String eventHubName);
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName);
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Destination.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Destination.java
new file mode 100644
index 000000000000..0acb7bba6b6f
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Destination.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Capture storage details for capture description.
+ */
+@JsonFlatten
+public class Destination {
+    /**
+     * Name for capture destination.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Resource id of the storage account to be used to create the blobs.
+     */
+    @JsonProperty(value = "properties.storageAccountResourceId")
+    private String storageAccountResourceId;
+
+    /**
+     * Blob container Name.
+     */
+    @JsonProperty(value = "properties.blobContainer")
+    private String blobContainer;
+
+    /**
+     * Blob naming convention for archive, e.g.
+     * {Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}.
+     * Here all the parameters (Namespace,EventHub .. etc) are mandatory
+     * irrespective of order.
+     */
+    @JsonProperty(value = "properties.archiveNameFormat")
+    private String archiveNameFormat;
+
+    /**
+     * Get name for capture destination.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name for capture destination.
+     *
+     * @param name the name value to set
+     * @return the Destination object itself.
+     */
+    public Destination withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get resource id of the storage account to be used to create the blobs.
+     *
+     * @return the storageAccountResourceId value
+     */
+    public String storageAccountResourceId() {
+        return this.storageAccountResourceId;
+    }
+
+    /**
+     * Set resource id of the storage account to be used to create the blobs.
+     *
+     * @param storageAccountResourceId the storageAccountResourceId value to set
+     * @return the Destination object itself.
+     */
+    public Destination withStorageAccountResourceId(String storageAccountResourceId) {
+        this.storageAccountResourceId = storageAccountResourceId;
+        return this;
+    }
+
+    /**
+     * Get blob container Name.
+     *
+     * @return the blobContainer value
+     */
+    public String blobContainer() {
+        return this.blobContainer;
+    }
+
+    /**
+     * Set blob container Name.
+     *
+     * @param blobContainer the blobContainer value to set
+     * @return the Destination object itself.
+     */
+    public Destination withBlobContainer(String blobContainer) {
+        this.blobContainer = blobContainer;
+        return this;
+    }
+
+    /**
+     * Get blob naming convention for archive, e.g. {Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}. Here all the parameters (Namespace,EventHub .. etc) are mandatory irrespective of order.
+     *
+     * @return the archiveNameFormat value
+     */
+    public String archiveNameFormat() {
+        return this.archiveNameFormat;
+    }
+
+    /**
+     * Set blob naming convention for archive, e.g. {Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}. Here all the parameters (Namespace,EventHub .. etc) are mandatory irrespective of order.
+     *
+     * @param archiveNameFormat the archiveNameFormat value to set
+     * @return the Destination object itself.
+     */
+    public Destination withArchiveNameFormat(String archiveNameFormat) {
+        this.archiveNameFormat = archiveNameFormat;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/DisasterRecoveryConfigNamespaceAuthorizationRule.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/DisasterRecoveryConfigNamespaceAuthorizationRule.java
new file mode 100644
index 000000000000..45c98f8ac6a9
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/DisasterRecoveryConfigNamespaceAuthorizationRule.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.AuthorizationRuleInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import java.util.List;
+
+/**
+ * Type representing DisasterRecoveryConfigNamespaceAuthorizationRule.
+ */
+public interface DisasterRecoveryConfigNamespaceAuthorizationRule extends HasInner<AuthorizationRuleInner>, Indexable, Refreshable<DisasterRecoveryConfigNamespaceAuthorizationRule>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the rights value.
+     */
+    List<AccessRights> rights();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/DisasterRecoveryConfigs.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/DisasterRecoveryConfigs.java
new file mode 100644
index 000000000000..6425d7ce48cf
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/DisasterRecoveryConfigs.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.DisasterRecoveryConfigsInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigNamespaceAuthorizationRule;
+
+/**
+ * Type representing DisasterRecoveryConfigs.
+ */
+public interface DisasterRecoveryConfigs extends SupportsCreating<ArmDisasterRecovery.DefinitionStages.Blank>, HasInner<DisasterRecoveryConfigsInner> {
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String resourceGroupName, String namespaceName, String name);
+
+    /**
+     * This operation disables the Disaster Recovery and stops replicating changes from primary to secondary namespaces.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable breakPairingAsync(String resourceGroupName, String namespaceName, String alias);
+
+    /**
+     * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable failOverAsync(String resourceGroupName, String namespaceName, String alias);
+
+    /**
+     * Retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ArmDisasterRecovery> getAsync(String resourceGroupName, String namespaceName, String alias);
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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<ArmDisasterRecovery> listAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String namespaceName, String alias);
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName);
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String alias);
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AccessKeys> listKeysAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName);
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EHNamespace.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EHNamespace.java
new file mode 100644
index 000000000000..57e4df248a12
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EHNamespace.java
@@ -0,0 +1,194 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
+import com.microsoft.azure.arm.resources.models.HasResourceGroup;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EHNamespaceInner;
+
+/**
+ * Type representing EHNamespace.
+ */
+public interface EHNamespace extends HasInner<EHNamespaceInner>, Resource, GroupableResourceCore<EventHubManager, EHNamespaceInner>, HasResourceGroup, Refreshable<EHNamespace>, Updatable<EHNamespace.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the isAutoInflateEnabled value.
+     */
+    Boolean isAutoInflateEnabled();
+
+    /**
+     * @return the kafkaEnabled value.
+     */
+    Boolean kafkaEnabled();
+
+    /**
+     * @return the maximumThroughputUnits value.
+     */
+    Integer maximumThroughputUnits();
+
+    /**
+     * @return the metricId value.
+     */
+    String metricId();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the serviceBusEndpoint value.
+     */
+    String serviceBusEndpoint();
+
+    /**
+     * @return the sku value.
+     */
+    Sku sku();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * The entirety of the EHNamespace definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of EHNamespace definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a EHNamespace definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the EHNamespace definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify IsAutoInflateEnabled.
+         */
+        interface WithIsAutoInflateEnabled {
+            /**
+             * Specifies isAutoInflateEnabled.
+             */
+            WithCreate withIsAutoInflateEnabled(Boolean isAutoInflateEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify KafkaEnabled.
+         */
+        interface WithKafkaEnabled {
+            /**
+             * Specifies kafkaEnabled.
+             */
+            WithCreate withKafkaEnabled(Boolean kafkaEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify MaximumThroughputUnits.
+         */
+        interface WithMaximumThroughputUnits {
+            /**
+             * Specifies maximumThroughputUnits.
+             */
+            WithCreate withMaximumThroughputUnits(Integer maximumThroughputUnits);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            WithCreate withSku(Sku sku);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<EHNamespace>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithIsAutoInflateEnabled, DefinitionStages.WithKafkaEnabled, DefinitionStages.WithMaximumThroughputUnits, DefinitionStages.WithSku {
+        }
+    }
+    /**
+     * The template for a EHNamespace update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<EHNamespace>, Resource.UpdateWithTags<Update>, UpdateStages.WithIsAutoInflateEnabled, UpdateStages.WithKafkaEnabled, UpdateStages.WithMaximumThroughputUnits, UpdateStages.WithSku {
+    }
+
+    /**
+     * Grouping of EHNamespace update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ehnamespace {0} allowing to specify IsAutoInflateEnabled.
+         */
+        interface WithIsAutoInflateEnabled {
+            /**
+             * Specifies isAutoInflateEnabled.
+             */
+            Update withIsAutoInflateEnabled(Boolean isAutoInflateEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify KafkaEnabled.
+         */
+        interface WithKafkaEnabled {
+            /**
+             * Specifies kafkaEnabled.
+             */
+            Update withKafkaEnabled(Boolean kafkaEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify MaximumThroughputUnits.
+         */
+        interface WithMaximumThroughputUnits {
+            /**
+             * Specifies maximumThroughputUnits.
+             */
+            Update withMaximumThroughputUnits(Integer maximumThroughputUnits);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            Update withSku(Sku sku);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EncodingCaptureDescription.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EncodingCaptureDescription.java
new file mode 100644
index 000000000000..215921dd71b3
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EncodingCaptureDescription.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for EncodingCaptureDescription.
+ */
+public enum EncodingCaptureDescription {
+    /** Enum value Avro. */
+    AVRO("Avro"),
+
+    /** Enum value AvroDeflate. */
+    AVRO_DEFLATE("AvroDeflate");
+
+    /** The actual serialized value for a EncodingCaptureDescription instance. */
+    private String value;
+
+    EncodingCaptureDescription(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a EncodingCaptureDescription instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed EncodingCaptureDescription object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static EncodingCaptureDescription fromString(String value) {
+        EncodingCaptureDescription[] items = EncodingCaptureDescription.values();
+        for (EncodingCaptureDescription item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EntityStatus.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EntityStatus.java
new file mode 100644
index 000000000000..182249717ae8
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EntityStatus.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for EntityStatus.
+ */
+public enum EntityStatus {
+    /** Enum value Active. */
+    ACTIVE("Active"),
+
+    /** Enum value Disabled. */
+    DISABLED("Disabled"),
+
+    /** Enum value Restoring. */
+    RESTORING("Restoring"),
+
+    /** Enum value SendDisabled. */
+    SEND_DISABLED("SendDisabled"),
+
+    /** Enum value ReceiveDisabled. */
+    RECEIVE_DISABLED("ReceiveDisabled"),
+
+    /** Enum value Creating. */
+    CREATING("Creating"),
+
+    /** Enum value Deleting. */
+    DELETING("Deleting"),
+
+    /** Enum value Renaming. */
+    RENAMING("Renaming"),
+
+    /** Enum value Unknown. */
+    UNKNOWN("Unknown");
+
+    /** The actual serialized value for a EntityStatus instance. */
+    private String value;
+
+    EntityStatus(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a EntityStatus instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed EntityStatus object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static EntityStatus fromString(String value) {
+        EntityStatus[] items = EntityStatus.values();
+        for (EntityStatus item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ErrorResponse.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ErrorResponse.java
new file mode 100644
index 000000000000..50c7c0239e00
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ErrorResponse.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Error response indicates EventHub service is not able to process the
+ * incoming request. The reason is provided in the error message.
+ */
+public class ErrorResponse {
+    /**
+     * Error code.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Error message indicating why the operation failed.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Get error code.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set error code.
+     *
+     * @param code the code value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get error message indicating why the operation failed.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set error message indicating why the operation failed.
+     *
+     * @param message the message value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ErrorResponseException.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ErrorResponseException.java
new file mode 100644
index 000000000000..697f561a6990
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ErrorResponseException.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.rest.RestException;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with ErrorResponse information.
+ */
+public class ErrorResponseException extends RestException {
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     * @param body the deserialized response body
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response, final ErrorResponse body) {
+        super(message, response, body);
+    }
+
+    @Override
+    public ErrorResponse body() {
+        return (ErrorResponse) super.body();
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EventHubs.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EventHubs.java
new file mode 100644
index 000000000000..1acb07de63dd
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EventHubs.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubsInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EventhubNamespaceAuthorizationRule;
+
+/**
+ * Type representing EventHubs.
+ */
+public interface EventHubs extends SupportsCreating<Eventhub.DefinitionStages.Blank>, HasInner<EventHubsInner> {
+    /**
+     * Begins definition for a new AuthorizationRule resource.
+     * @param name resource name.
+     * @return the first stage of the new AuthorizationRule definition.
+     */
+    EventhubNamespaceAuthorizationRule.DefinitionStages.Blank defineAuthorizationRule(String name);
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Eventhub> getAsync(String resourceGroupName, String namespaceName, String eventHubName);
+
+    /**
+     * Gets all the Event Hubs in 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<Eventhub> listByNamespaceAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName);
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EventhubNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<EventhubNamespaceAuthorizationRule> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName);
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AccessKeys> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, RegenerateAccessKeyParameters parameters);
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Eventhub.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Eventhub.java
new file mode 100644
index 000000000000..2ee879a47429
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Eventhub.java
@@ -0,0 +1,202 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventhubInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import java.util.List;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing Eventhub.
+ */
+public interface Eventhub extends HasInner<EventhubInner>, Indexable, Refreshable<Eventhub>, Updatable<Eventhub.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the captureDescription value.
+     */
+    CaptureDescription captureDescription();
+
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the messageRetentionInDays value.
+     */
+    Long messageRetentionInDays();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the partitionCount value.
+     */
+    Long partitionCount();
+
+    /**
+     * @return the partitionIds value.
+     */
+    List<String> partitionIds();
+
+    /**
+     * @return the status value.
+     */
+    EntityStatus status();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * The entirety of the Eventhub definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of Eventhub definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a Eventhub definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the eventhub definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithCreate withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the eventhub definition allowing to specify CaptureDescription.
+         */
+        interface WithCaptureDescription {
+            /**
+             * Specifies captureDescription.
+             */
+            WithCreate withCaptureDescription(CaptureDescription captureDescription);
+        }
+
+        /**
+         * The stage of the eventhub definition allowing to specify MessageRetentionInDays.
+         */
+        interface WithMessageRetentionInDays {
+            /**
+             * Specifies messageRetentionInDays.
+             */
+            WithCreate withMessageRetentionInDays(Long messageRetentionInDays);
+        }
+
+        /**
+         * The stage of the eventhub definition allowing to specify PartitionCount.
+         */
+        interface WithPartitionCount {
+            /**
+             * Specifies partitionCount.
+             */
+            WithCreate withPartitionCount(Long partitionCount);
+        }
+
+        /**
+         * The stage of the eventhub definition allowing to specify Status.
+         */
+        interface WithStatus {
+            /**
+             * Specifies status.
+             */
+            WithCreate withStatus(EntityStatus status);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<Eventhub>, DefinitionStages.WithCaptureDescription, DefinitionStages.WithMessageRetentionInDays, DefinitionStages.WithPartitionCount, DefinitionStages.WithStatus {
+        }
+    }
+    /**
+     * The template for a Eventhub update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<Eventhub>, UpdateStages.WithCaptureDescription, UpdateStages.WithMessageRetentionInDays, UpdateStages.WithPartitionCount, UpdateStages.WithStatus {
+    }
+
+    /**
+     * Grouping of Eventhub update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the eventhub update allowing to specify CaptureDescription.
+         */
+        interface WithCaptureDescription {
+            /**
+             * Specifies captureDescription.
+             */
+            Update withCaptureDescription(CaptureDescription captureDescription);
+        }
+
+        /**
+         * The stage of the eventhub update allowing to specify MessageRetentionInDays.
+         */
+        interface WithMessageRetentionInDays {
+            /**
+             * Specifies messageRetentionInDays.
+             */
+            Update withMessageRetentionInDays(Long messageRetentionInDays);
+        }
+
+        /**
+         * The stage of the eventhub update allowing to specify PartitionCount.
+         */
+        interface WithPartitionCount {
+            /**
+             * Specifies partitionCount.
+             */
+            Update withPartitionCount(Long partitionCount);
+        }
+
+        /**
+         * The stage of the eventhub update allowing to specify Status.
+         */
+        interface WithStatus {
+            /**
+             * Specifies status.
+             */
+            Update withStatus(EntityStatus status);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EventhubNamespaceAuthorizationRule.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EventhubNamespaceAuthorizationRule.java
new file mode 100644
index 000000000000..4837d90a6504
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/EventhubNamespaceAuthorizationRule.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.AuthorizationRuleInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import java.util.List;
+
+/**
+ * Type representing EventhubNamespaceAuthorizationRule.
+ */
+public interface EventhubNamespaceAuthorizationRule extends HasInner<AuthorizationRuleInner>, Indexable, Refreshable<EventhubNamespaceAuthorizationRule>, Updatable<EventhubNamespaceAuthorizationRule.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the rights value.
+     */
+    List<AccessRights> rights();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the EventhubNamespaceAuthorizationRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithEventhub, DefinitionStages.WithRights, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of EventhubNamespaceAuthorizationRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a EventhubNamespaceAuthorizationRule definition.
+         */
+        interface Blank extends WithEventhub {
+        }
+
+        /**
+         * The stage of the eventhubnamespaceauthorizationrule definition allowing to specify Eventhub.
+         */
+        interface WithEventhub {
+           /**
+            * Specifies resourceGroupName, namespaceName, eventHubName.
+            */
+            WithRights withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName);
+        }
+
+        /**
+         * The stage of the eventhubnamespaceauthorizationrule definition allowing to specify Rights.
+         */
+        interface WithRights {
+           /**
+            * Specifies rights.
+            */
+            WithCreate withRights(List<AccessRights> rights);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<EventhubNamespaceAuthorizationRule> {
+        }
+    }
+    /**
+     * The template for a EventhubNamespaceAuthorizationRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<EventhubNamespaceAuthorizationRule>, UpdateStages.WithRights {
+    }
+
+    /**
+     * Grouping of EventhubNamespaceAuthorizationRule update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the eventhubnamespaceauthorizationrule update allowing to specify Rights.
+         */
+        interface WithRights {
+            /**
+             * Specifies rights.
+             */
+            Update withRights(List<AccessRights> rights);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/KeyType.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/KeyType.java
new file mode 100644
index 000000000000..137ec779d65a
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/KeyType.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for KeyType.
+ */
+public enum KeyType {
+    /** Enum value PrimaryKey. */
+    PRIMARY_KEY("PrimaryKey"),
+
+    /** Enum value SecondaryKey. */
+    SECONDARY_KEY("SecondaryKey");
+
+    /** The actual serialized value for a KeyType instance. */
+    private String value;
+
+    KeyType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a KeyType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed KeyType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static KeyType fromString(String value) {
+        KeyType[] items = KeyType.values();
+        for (KeyType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingPlan.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingPlan.java
new file mode 100644
index 000000000000..0976ad0b2e88
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingPlan.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.MessagingPlanInner;
+import java.util.Map;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing MessagingPlan.
+ */
+public interface MessagingPlan extends HasInner<MessagingPlanInner>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the revision value.
+     */
+    Long revision();
+
+    /**
+     * @return the selectedEventHubUnit value.
+     */
+    Integer selectedEventHubUnit();
+
+    /**
+     * @return the sku value.
+     */
+    Integer sku();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingRegions.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingRegions.java
new file mode 100644
index 000000000000..a085a14fcbe7
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingRegions.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.MessagingRegionsInner;
+import java.util.Map;
+
+/**
+ * Type representing MessagingRegions.
+ */
+public interface MessagingRegions extends HasInner<MessagingRegionsInner>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the properties value.
+     */
+    MessagingRegionsProperties properties();
+
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingRegionsProperties.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingRegionsProperties.java
new file mode 100644
index 000000000000..a02caddb458c
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/MessagingRegionsProperties.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The MessagingRegionsProperties model.
+ */
+public class MessagingRegionsProperties {
+    /**
+     * Region code.
+     */
+    @JsonProperty(value = "code", access = JsonProperty.Access.WRITE_ONLY)
+    private String code;
+
+    /**
+     * Full name of the region.
+     */
+    @JsonProperty(value = "fullName", access = JsonProperty.Access.WRITE_ONLY)
+    private String fullName;
+
+    /**
+     * Get region code.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Get full name of the region.
+     *
+     * @return the fullName value
+     */
+    public String fullName() {
+        return this.fullName;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/NamespaceAuthorizationRule.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/NamespaceAuthorizationRule.java
new file mode 100644
index 000000000000..1889d4ec4074
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/NamespaceAuthorizationRule.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.AuthorizationRuleInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import java.util.List;
+
+/**
+ * Type representing NamespaceAuthorizationRule.
+ */
+public interface NamespaceAuthorizationRule extends HasInner<AuthorizationRuleInner>, Indexable, Refreshable<NamespaceAuthorizationRule>, Updatable<NamespaceAuthorizationRule.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the rights value.
+     */
+    List<AccessRights> rights();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the NamespaceAuthorizationRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithRights, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of NamespaceAuthorizationRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a NamespaceAuthorizationRule definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the namespaceauthorizationrule definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithRights withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the namespaceauthorizationrule definition allowing to specify Rights.
+         */
+        interface WithRights {
+           /**
+            * Specifies rights.
+            */
+            WithCreate withRights(List<AccessRights> rights);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<NamespaceAuthorizationRule> {
+        }
+    }
+    /**
+     * The template for a NamespaceAuthorizationRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<NamespaceAuthorizationRule>, UpdateStages.WithRights {
+    }
+
+    /**
+     * Grouping of NamespaceAuthorizationRule update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the namespaceauthorizationrule update allowing to specify Rights.
+         */
+        interface WithRights {
+            /**
+             * Specifies rights.
+             */
+            Update withRights(List<AccessRights> rights);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java
new file mode 100644
index 000000000000..8d7ffe48bb3a
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import com.microsoft.azure.arm.resources.collection.SupportsDeletingByResourceGroup;
+import com.microsoft.azure.arm.resources.collection.SupportsBatchDeletion;
+import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
+import rx.Observable;
+import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.NamespacesInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2017_04_01.NamespaceAuthorizationRule;
+import rx.Completable;
+
+/**
+ * Type representing Namespaces.
+ */
+public interface Namespaces extends SupportsCreating<EHNamespace.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<EHNamespace>, SupportsListingByResourceGroup<EHNamespace>, SupportsListing<EHNamespace>, HasInner<NamespacesInner> {
+    /**
+     * Begins definition for a new AuthorizationRule resource.
+     * @param name resource name.
+     * @return the first stage of the new AuthorizationRule definition.
+     */
+    NamespaceAuthorizationRule.DefinitionStages.Blank defineAuthorizationRule(String name);
+
+    /**
+     * Gets messaging plan for specified 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<MessagingPlan> getMessagingPlanAsync(String resourceGroupName, String namespaceName);
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String name);
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+    /**
+     * Gets a list of authorization rules 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<NamespaceAuthorizationRule> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AccessKeys> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName);
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters required to regenerate the connection string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters);
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Operation.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Operation.java
new file mode 100644
index 000000000000..6f75013e5b72
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Operation.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.OperationInner;
+
+/**
+ * Type representing Operation.
+ */
+public interface Operation extends HasInner<OperationInner>, HasManager<EventHubManager> {
+    /**
+     * @return the display value.
+     */
+    OperationDisplay display();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/OperationDisplay.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/OperationDisplay.java
new file mode 100644
index 000000000000..27960fbaad86
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/OperationDisplay.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The object that represents the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft.EventHub.
+     */
+    @JsonProperty(value = "provider", access = JsonProperty.Access.WRITE_ONLY)
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed: Invoice, etc.
+     */
+    @JsonProperty(value = "resource", access = JsonProperty.Access.WRITE_ONLY)
+    private String resource;
+
+    /**
+     * Operation type: Read, write, delete, etc.
+     */
+    @JsonProperty(value = "operation", access = JsonProperty.Access.WRITE_ONLY)
+    private String operation;
+
+    /**
+     * Get service provider: Microsoft.EventHub.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Get resource on which the operation is performed: Invoice, etc.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Get operation type: Read, write, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Operations.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Operations.java
new file mode 100644
index 000000000000..d83526c39ea6
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Operations.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.OperationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Operations.
+ */
+public interface Operations extends HasInner<OperationsInner> {
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Operation> listAsync();
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ProvisioningStateDR.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ProvisioningStateDR.java
new file mode 100644
index 000000000000..a96045d51e43
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/ProvisioningStateDR.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for ProvisioningStateDR.
+ */
+public enum ProvisioningStateDR {
+    /** Enum value Accepted. */
+    ACCEPTED("Accepted"),
+
+    /** Enum value Succeeded. */
+    SUCCEEDED("Succeeded"),
+
+    /** Enum value Failed. */
+    FAILED("Failed");
+
+    /** The actual serialized value for a ProvisioningStateDR instance. */
+    private String value;
+
+    ProvisioningStateDR(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a ProvisioningStateDR instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed ProvisioningStateDR object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static ProvisioningStateDR fromString(String value) {
+        ProvisioningStateDR[] items = ProvisioningStateDR.values();
+        for (ProvisioningStateDR item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/RegenerateAccessKeyParameters.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/RegenerateAccessKeyParameters.java
new file mode 100644
index 000000000000..f9cca5f81e40
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/RegenerateAccessKeyParameters.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters supplied to the Regenerate Authorization Rule operation,
+ * specifies which key needs to be reset.
+ */
+public class RegenerateAccessKeyParameters {
+    /**
+     * The access key to regenerate. Possible values include: 'PrimaryKey',
+     * 'SecondaryKey'.
+     */
+    @JsonProperty(value = "keyType", required = true)
+    private KeyType keyType;
+
+    /**
+     * Optional, if the key value provided, is set for KeyType or autogenerated
+     * Key value set for keyType.
+     */
+    @JsonProperty(value = "key")
+    private String key;
+
+    /**
+     * Get the access key to regenerate. Possible values include: 'PrimaryKey', 'SecondaryKey'.
+     *
+     * @return the keyType value
+     */
+    public KeyType keyType() {
+        return this.keyType;
+    }
+
+    /**
+     * Set the access key to regenerate. Possible values include: 'PrimaryKey', 'SecondaryKey'.
+     *
+     * @param keyType the keyType value to set
+     * @return the RegenerateAccessKeyParameters object itself.
+     */
+    public RegenerateAccessKeyParameters withKeyType(KeyType keyType) {
+        this.keyType = keyType;
+        return this;
+    }
+
+    /**
+     * Get optional, if the key value provided, is set for KeyType or autogenerated Key value set for keyType.
+     *
+     * @return the key value
+     */
+    public String key() {
+        return this.key;
+    }
+
+    /**
+     * Set optional, if the key value provided, is set for KeyType or autogenerated Key value set for keyType.
+     *
+     * @param key the key value to set
+     * @return the RegenerateAccessKeyParameters object itself.
+     */
+    public RegenerateAccessKeyParameters withKey(String key) {
+        this.key = key;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Regions.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Regions.java
new file mode 100644
index 000000000000..07e473fcc9c2
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Regions.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.RegionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Regions.
+ */
+public interface Regions extends HasInner<RegionsInner> {
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @param sku The sku type.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<MessagingRegions> listBySkuAsync(final String sku);
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/RoleDisasterRecovery.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/RoleDisasterRecovery.java
new file mode 100644
index 000000000000..04f49c31587f
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/RoleDisasterRecovery.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for RoleDisasterRecovery.
+ */
+public enum RoleDisasterRecovery {
+    /** Enum value Primary. */
+    PRIMARY("Primary"),
+
+    /** Enum value PrimaryNotReplicating. */
+    PRIMARY_NOT_REPLICATING("PrimaryNotReplicating"),
+
+    /** Enum value Secondary. */
+    SECONDARY("Secondary");
+
+    /** The actual serialized value for a RoleDisasterRecovery instance. */
+    private String value;
+
+    RoleDisasterRecovery(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a RoleDisasterRecovery instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed RoleDisasterRecovery object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static RoleDisasterRecovery fromString(String value) {
+        RoleDisasterRecovery[] items = RoleDisasterRecovery.values();
+        for (RoleDisasterRecovery item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Sku.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Sku.java
new file mode 100644
index 000000000000..5d41344161f6
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Sku.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU parameters supplied to the create namespace operation.
+ */
+public class Sku {
+    /**
+     * Name of this SKU. Possible values include: 'Basic', 'Standard'.
+     */
+    @JsonProperty(value = "name", required = true)
+    private SkuName name;
+
+    /**
+     * The billing tier of this particular SKU. Possible values include:
+     * 'Basic', 'Standard'.
+     */
+    @JsonProperty(value = "tier")
+    private SkuTier tier;
+
+    /**
+     * The Event Hubs throughput units, value should be 0 to 20 throughput
+     * units.
+     */
+    @JsonProperty(value = "capacity")
+    private Integer capacity;
+
+    /**
+     * Get name of this SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the name value
+     */
+    public SkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of this SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the Sku object itself.
+     */
+    public Sku withName(SkuName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the billing tier of this particular SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the tier value
+     */
+    public SkuTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set the billing tier of this particular SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param tier the tier value to set
+     * @return the Sku object itself.
+     */
+    public Sku withTier(SkuTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+    /**
+     * Get the Event Hubs throughput units, value should be 0 to 20 throughput units.
+     *
+     * @return the capacity value
+     */
+    public Integer capacity() {
+        return this.capacity;
+    }
+
+    /**
+     * Set the Event Hubs throughput units, value should be 0 to 20 throughput units.
+     *
+     * @param capacity the capacity value to set
+     * @return the Sku object itself.
+     */
+    public Sku withCapacity(Integer capacity) {
+        this.capacity = capacity;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/SkuName.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/SkuName.java
new file mode 100644
index 000000000000..69061d87b79d
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/SkuName.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SkuName.
+ */
+public final class SkuName extends ExpandableStringEnum<SkuName> {
+    /** Static value Basic for SkuName. */
+    public static final SkuName BASIC = fromString("Basic");
+
+    /** Static value Standard for SkuName. */
+    public static final SkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a SkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SkuName
+     */
+    @JsonCreator
+    public static SkuName fromString(String name) {
+        return fromString(name, SkuName.class);
+    }
+
+    /**
+     * @return known SkuName values
+     */
+    public static Collection<SkuName> values() {
+        return values(SkuName.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/SkuTier.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/SkuTier.java
new file mode 100644
index 000000000000..ecbc5685e914
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/SkuTier.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SkuTier.
+ */
+public final class SkuTier extends ExpandableStringEnum<SkuTier> {
+    /** Static value Basic for SkuTier. */
+    public static final SkuTier BASIC = fromString("Basic");
+
+    /** Static value Standard for SkuTier. */
+    public static final SkuTier STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a SkuTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SkuTier
+     */
+    @JsonCreator
+    public static SkuTier fromString(String name) {
+        return fromString(name, SkuTier.class);
+    }
+
+    /**
+     * @return known SkuTier values
+     */
+    public static Collection<SkuTier> values() {
+        return values(SkuTier.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/UnavailableReason.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/UnavailableReason.java
new file mode 100644
index 000000000000..534e95441d9f
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/UnavailableReason.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for UnavailableReason.
+ */
+public enum UnavailableReason {
+    /** Enum value None. */
+    NONE("None"),
+
+    /** Enum value InvalidName. */
+    INVALID_NAME("InvalidName"),
+
+    /** Enum value SubscriptionIsDisabled. */
+    SUBSCRIPTION_IS_DISABLED("SubscriptionIsDisabled"),
+
+    /** Enum value NameInUse. */
+    NAME_IN_USE("NameInUse"),
+
+    /** Enum value NameInLockdown. */
+    NAME_IN_LOCKDOWN("NameInLockdown"),
+
+    /** Enum value TooManyNamespaceInCurrentSubscription. */
+    TOO_MANY_NAMESPACE_IN_CURRENT_SUBSCRIPTION("TooManyNamespaceInCurrentSubscription");
+
+    /** The actual serialized value for a UnavailableReason instance. */
+    private String value;
+
+    UnavailableReason(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a UnavailableReason instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed UnavailableReason object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static UnavailableReason fromString(String value) {
+        UnavailableReason[] items = UnavailableReason.values();
+        for (UnavailableReason item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AccessKeysImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AccessKeysImpl.java
new file mode 100644
index 000000000000..2fa28515759e
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AccessKeysImpl.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessKeys;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class AccessKeysImpl extends WrapperImpl<AccessKeysInner> implements AccessKeys {
+    private final EventHubManager manager;
+    AccessKeysImpl(AccessKeysInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String aliasPrimaryConnectionString() {
+        return this.inner().aliasPrimaryConnectionString();
+    }
+
+    @Override
+    public String aliasSecondaryConnectionString() {
+        return this.inner().aliasSecondaryConnectionString();
+    }
+
+    @Override
+    public String keyName() {
+        return this.inner().keyName();
+    }
+
+    @Override
+    public String primaryConnectionString() {
+        return this.inner().primaryConnectionString();
+    }
+
+    @Override
+    public String primaryKey() {
+        return this.inner().primaryKey();
+    }
+
+    @Override
+    public String secondaryConnectionString() {
+        return this.inner().secondaryConnectionString();
+    }
+
+    @Override
+    public String secondaryKey() {
+        return this.inner().secondaryKey();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AccessKeysInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AccessKeysInner.java
new file mode 100644
index 000000000000..b2de7bfcfe38
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AccessKeysInner.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Namespace/EventHub Connection String.
+ */
+public class AccessKeysInner {
+    /**
+     * Primary connection string of the created namespace AuthorizationRule.
+     */
+    @JsonProperty(value = "primaryConnectionString", access = JsonProperty.Access.WRITE_ONLY)
+    private String primaryConnectionString;
+
+    /**
+     * Secondary connection string of the created namespace AuthorizationRule.
+     */
+    @JsonProperty(value = "secondaryConnectionString", access = JsonProperty.Access.WRITE_ONLY)
+    private String secondaryConnectionString;
+
+    /**
+     * Primary connection string of the alias if GEO DR is enabled.
+     */
+    @JsonProperty(value = "aliasPrimaryConnectionString", access = JsonProperty.Access.WRITE_ONLY)
+    private String aliasPrimaryConnectionString;
+
+    /**
+     * Secondary  connection string of the alias if GEO DR is enabled.
+     */
+    @JsonProperty(value = "aliasSecondaryConnectionString", access = JsonProperty.Access.WRITE_ONLY)
+    private String aliasSecondaryConnectionString;
+
+    /**
+     * A base64-encoded 256-bit primary key for signing and validating the SAS
+     * token.
+     */
+    @JsonProperty(value = "primaryKey", access = JsonProperty.Access.WRITE_ONLY)
+    private String primaryKey;
+
+    /**
+     * A base64-encoded 256-bit primary key for signing and validating the SAS
+     * token.
+     */
+    @JsonProperty(value = "secondaryKey", access = JsonProperty.Access.WRITE_ONLY)
+    private String secondaryKey;
+
+    /**
+     * A string that describes the AuthorizationRule.
+     */
+    @JsonProperty(value = "keyName", access = JsonProperty.Access.WRITE_ONLY)
+    private String keyName;
+
+    /**
+     * Get primary connection string of the created namespace AuthorizationRule.
+     *
+     * @return the primaryConnectionString value
+     */
+    public String primaryConnectionString() {
+        return this.primaryConnectionString;
+    }
+
+    /**
+     * Get secondary connection string of the created namespace AuthorizationRule.
+     *
+     * @return the secondaryConnectionString value
+     */
+    public String secondaryConnectionString() {
+        return this.secondaryConnectionString;
+    }
+
+    /**
+     * Get primary connection string of the alias if GEO DR is enabled.
+     *
+     * @return the aliasPrimaryConnectionString value
+     */
+    public String aliasPrimaryConnectionString() {
+        return this.aliasPrimaryConnectionString;
+    }
+
+    /**
+     * Get secondary  connection string of the alias if GEO DR is enabled.
+     *
+     * @return the aliasSecondaryConnectionString value
+     */
+    public String aliasSecondaryConnectionString() {
+        return this.aliasSecondaryConnectionString;
+    }
+
+    /**
+     * Get a base64-encoded 256-bit primary key for signing and validating the SAS token.
+     *
+     * @return the primaryKey value
+     */
+    public String primaryKey() {
+        return this.primaryKey;
+    }
+
+    /**
+     * Get a base64-encoded 256-bit primary key for signing and validating the SAS token.
+     *
+     * @return the secondaryKey value
+     */
+    public String secondaryKey() {
+        return this.secondaryKey;
+    }
+
+    /**
+     * Get a string that describes the AuthorizationRule.
+     *
+     * @return the keyName value
+     */
+    public String keyName() {
+        return this.keyName;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ArmDisasterRecoveryImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ArmDisasterRecoveryImpl.java
new file mode 100644
index 000000000000..89a728f558a7
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ArmDisasterRecoveryImpl.java
@@ -0,0 +1,133 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.ArmDisasterRecovery;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ProvisioningStateDR;
+import com.microsoft.azure.management.eventhub.v2017_04_01.RoleDisasterRecovery;
+
+class ArmDisasterRecoveryImpl extends CreatableUpdatableImpl<ArmDisasterRecovery, ArmDisasterRecoveryInner, ArmDisasterRecoveryImpl> implements ArmDisasterRecovery, ArmDisasterRecovery.Definition, ArmDisasterRecovery.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String alias;
+
+    ArmDisasterRecoveryImpl(String name, EventHubManager manager) {
+        super(name, new ArmDisasterRecoveryInner());
+        this.manager = manager;
+        // Set resource name
+        this.alias = name;
+        //
+    }
+
+    ArmDisasterRecoveryImpl(ArmDisasterRecoveryInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.alias = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.alias = IdParsingUtils.getValueFromIdByName(inner.id(), "disasterRecoveryConfigs");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ArmDisasterRecovery> createResourceAsync() {
+        DisasterRecoveryConfigsInner client = this.manager().inner().disasterRecoveryConfigs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.alias, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ArmDisasterRecovery> updateResourceAsync() {
+        DisasterRecoveryConfigsInner client = this.manager().inner().disasterRecoveryConfigs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.alias, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ArmDisasterRecoveryInner> getInnerAsync() {
+        DisasterRecoveryConfigsInner client = this.manager().inner().disasterRecoveryConfigs();
+        return client.getAsync(this.resourceGroupName, this.namespaceName, this.alias);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String alternateName() {
+        return this.inner().alternateName();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String partnerNamespace() {
+        return this.inner().partnerNamespace();
+    }
+
+    @Override
+    public Long pendingReplicationOperationsCount() {
+        return this.inner().pendingReplicationOperationsCount();
+    }
+
+    @Override
+    public ProvisioningStateDR provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public RoleDisasterRecovery role() {
+        return this.inner().role();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public ArmDisasterRecoveryImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+    @Override
+    public ArmDisasterRecoveryImpl withAlternateName(String alternateName) {
+        this.inner().withAlternateName(alternateName);
+        return this;
+    }
+
+    @Override
+    public ArmDisasterRecoveryImpl withPartnerNamespace(String partnerNamespace) {
+        this.inner().withPartnerNamespace(partnerNamespace);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ArmDisasterRecoveryInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ArmDisasterRecoveryInner.java
new file mode 100644
index 000000000000..29639fd8d637
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ArmDisasterRecoveryInner.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.ProvisioningStateDR;
+import com.microsoft.azure.management.eventhub.v2017_04_01.RoleDisasterRecovery;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in List or Get Alias(Disaster Recovery configuration) operation.
+ */
+@JsonFlatten
+public class ArmDisasterRecoveryInner extends ProxyResource {
+    /**
+     * Provisioning state of the Alias(Disaster Recovery configuration) -
+     * possible values 'Accepted' or 'Succeeded' or 'Failed'. Possible values
+     * include: 'Accepted', 'Succeeded', 'Failed'.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private ProvisioningStateDR provisioningState;
+
+    /**
+     * ARM Id of the Primary/Secondary eventhub namespace name, which is part
+     * of GEO DR pairing.
+     */
+    @JsonProperty(value = "properties.partnerNamespace")
+    private String partnerNamespace;
+
+    /**
+     * Alternate name specified when alias and namespace names are same.
+     */
+    @JsonProperty(value = "properties.alternateName")
+    private String alternateName;
+
+    /**
+     * role of namespace in GEO DR - possible values 'Primary' or
+     * 'PrimaryNotReplicating' or 'Secondary'. Possible values include:
+     * 'Primary', 'PrimaryNotReplicating', 'Secondary'.
+     */
+    @JsonProperty(value = "properties.role", access = JsonProperty.Access.WRITE_ONLY)
+    private RoleDisasterRecovery role;
+
+    /**
+     * Number of entities pending to be replicated.
+     */
+    @JsonProperty(value = "properties.pendingReplicationOperationsCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Long pendingReplicationOperationsCount;
+
+    /**
+     * Get provisioning state of the Alias(Disaster Recovery configuration) - possible values 'Accepted' or 'Succeeded' or 'Failed'. Possible values include: 'Accepted', 'Succeeded', 'Failed'.
+     *
+     * @return the provisioningState value
+     */
+    public ProvisioningStateDR provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get aRM Id of the Primary/Secondary eventhub namespace name, which is part of GEO DR pairing.
+     *
+     * @return the partnerNamespace value
+     */
+    public String partnerNamespace() {
+        return this.partnerNamespace;
+    }
+
+    /**
+     * Set aRM Id of the Primary/Secondary eventhub namespace name, which is part of GEO DR pairing.
+     *
+     * @param partnerNamespace the partnerNamespace value to set
+     * @return the ArmDisasterRecoveryInner object itself.
+     */
+    public ArmDisasterRecoveryInner withPartnerNamespace(String partnerNamespace) {
+        this.partnerNamespace = partnerNamespace;
+        return this;
+    }
+
+    /**
+     * Get alternate name specified when alias and namespace names are same.
+     *
+     * @return the alternateName value
+     */
+    public String alternateName() {
+        return this.alternateName;
+    }
+
+    /**
+     * Set alternate name specified when alias and namespace names are same.
+     *
+     * @param alternateName the alternateName value to set
+     * @return the ArmDisasterRecoveryInner object itself.
+     */
+    public ArmDisasterRecoveryInner withAlternateName(String alternateName) {
+        this.alternateName = alternateName;
+        return this;
+    }
+
+    /**
+     * Get role of namespace in GEO DR - possible values 'Primary' or 'PrimaryNotReplicating' or 'Secondary'. Possible values include: 'Primary', 'PrimaryNotReplicating', 'Secondary'.
+     *
+     * @return the role value
+     */
+    public RoleDisasterRecovery role() {
+        return this.role;
+    }
+
+    /**
+     * Get number of entities pending to be replicated.
+     *
+     * @return the pendingReplicationOperationsCount value
+     */
+    public Long pendingReplicationOperationsCount() {
+        return this.pendingReplicationOperationsCount;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AuthorizationRuleInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AuthorizationRuleInner.java
new file mode 100644
index 000000000000..64fa5e4f0851
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/AuthorizationRuleInner.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessRights;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in a List or Get AuthorizationRule operation.
+ */
+@JsonFlatten
+public class AuthorizationRuleInner extends ProxyResource {
+    /**
+     * The rights associated with the rule.
+     */
+    @JsonProperty(value = "properties.rights", required = true)
+    private List<AccessRights> rights;
+
+    /**
+     * Get the rights associated with the rule.
+     *
+     * @return the rights value
+     */
+    public List<AccessRights> rights() {
+        return this.rights;
+    }
+
+    /**
+     * Set the rights associated with the rule.
+     *
+     * @param rights the rights value to set
+     * @return the AuthorizationRuleInner object itself.
+     */
+    public AuthorizationRuleInner withRights(List<AccessRights> rights) {
+        this.rights = rights;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/CheckNameAvailabilityResultImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/CheckNameAvailabilityResultImpl.java
new file mode 100644
index 000000000000..bde32f51c0b3
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/CheckNameAvailabilityResultImpl.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.CheckNameAvailabilityResult;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.UnavailableReason;
+
+class CheckNameAvailabilityResultImpl extends WrapperImpl<CheckNameAvailabilityResultInner> implements CheckNameAvailabilityResult {
+    private final EventHubManager manager;
+    CheckNameAvailabilityResultImpl(CheckNameAvailabilityResultInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String message() {
+        return this.inner().message();
+    }
+
+    @Override
+    public Boolean nameAvailable() {
+        return this.inner().nameAvailable();
+    }
+
+    @Override
+    public UnavailableReason reason() {
+        return this.inner().reason();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/CheckNameAvailabilityResultInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/CheckNameAvailabilityResultInner.java
new file mode 100644
index 000000000000..742258aeaa10
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/CheckNameAvailabilityResultInner.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.UnavailableReason;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Result of the CheckNameAvailability operation.
+ */
+public class CheckNameAvailabilityResultInner {
+    /**
+     * The detailed info regarding the reason associated with the Namespace.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Value indicating Namespace is availability, true if the Namespace is
+     * available; otherwise, false.
+     */
+    @JsonProperty(value = "nameAvailable")
+    private Boolean nameAvailable;
+
+    /**
+     * The reason for unavailability of a Namespace. Possible values include:
+     * 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse',
+     * 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription'.
+     */
+    @JsonProperty(value = "reason")
+    private UnavailableReason reason;
+
+    /**
+     * Get the detailed info regarding the reason associated with the Namespace.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get value indicating Namespace is availability, true if the Namespace is available; otherwise, false.
+     *
+     * @return the nameAvailable value
+     */
+    public Boolean nameAvailable() {
+        return this.nameAvailable;
+    }
+
+    /**
+     * Set value indicating Namespace is availability, true if the Namespace is available; otherwise, false.
+     *
+     * @param nameAvailable the nameAvailable value to set
+     * @return the CheckNameAvailabilityResultInner object itself.
+     */
+    public CheckNameAvailabilityResultInner withNameAvailable(Boolean nameAvailable) {
+        this.nameAvailable = nameAvailable;
+        return this;
+    }
+
+    /**
+     * Get the reason for unavailability of a Namespace. Possible values include: 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse', 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription'.
+     *
+     * @return the reason value
+     */
+    public UnavailableReason reason() {
+        return this.reason;
+    }
+
+    /**
+     * Set the reason for unavailability of a Namespace. Possible values include: 'None', 'InvalidName', 'SubscriptionIsDisabled', 'NameInUse', 'NameInLockdown', 'TooManyNamespaceInCurrentSubscription'.
+     *
+     * @param reason the reason value to set
+     * @return the CheckNameAvailabilityResultInner object itself.
+     */
+    public CheckNameAvailabilityResultInner withReason(UnavailableReason reason) {
+        this.reason = reason;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupImpl.java
new file mode 100644
index 000000000000..ceb8427b1fb5
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupImpl.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.ConsumerGroup;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import org.joda.time.DateTime;
+
+class ConsumerGroupImpl extends CreatableUpdatableImpl<ConsumerGroup, ConsumerGroupInner, ConsumerGroupImpl> implements ConsumerGroup, ConsumerGroup.Definition, ConsumerGroup.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String eventHubName;
+    private String consumerGroupName;
+
+    ConsumerGroupImpl(String name, EventHubManager manager) {
+        super(name, new ConsumerGroupInner());
+        this.manager = manager;
+        // Set resource name
+        this.consumerGroupName = name;
+        //
+    }
+
+    ConsumerGroupImpl(ConsumerGroupInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.consumerGroupName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.eventHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "eventhubs");
+        this.consumerGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "consumergroups");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ConsumerGroup> createResourceAsync() {
+        ConsumerGroupsInner client = this.manager().inner().consumerGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.consumerGroupName)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ConsumerGroup> updateResourceAsync() {
+        ConsumerGroupsInner client = this.manager().inner().consumerGroups();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.consumerGroupName)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ConsumerGroupInner> getInnerAsync() {
+        ConsumerGroupsInner client = this.manager().inner().consumerGroups();
+        return client.getAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.consumerGroupName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public String userMetadata() {
+        return this.inner().userMetadata();
+    }
+
+    @Override
+    public ConsumerGroupImpl withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        this.eventHubName = eventHubName;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupInner.java
new file mode 100644
index 000000000000..ad9edaad8bd3
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupInner.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in List or Get Consumer group operation.
+ */
+@JsonFlatten
+public class ConsumerGroupInner extends ProxyResource {
+    /**
+     * Exact time the message was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * The exact time the message was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * User Metadata is a placeholder to store user-defined string data with
+     * maximum length 1024. e.g. it can be used to store descriptive data, such
+     * as list of teams and their contact information also user-defined
+     * configuration settings can be stored.
+     */
+    @JsonProperty(value = "properties.userMetadata")
+    private String userMetadata;
+
+    /**
+     * Get exact time the message was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get the exact time the message was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get user Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.
+     *
+     * @return the userMetadata value
+     */
+    public String userMetadata() {
+        return this.userMetadata;
+    }
+
+    /**
+     * Set user Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.
+     *
+     * @param userMetadata the userMetadata value to set
+     * @return the ConsumerGroupInner object itself.
+     */
+    public ConsumerGroupInner withUserMetadata(String userMetadata) {
+        this.userMetadata = userMetadata;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupsImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupsImpl.java
new file mode 100644
index 000000000000..ad85b0a350c9
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupsImpl.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ConsumerGroups;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ConsumerGroup;
+
+class ConsumerGroupsImpl extends WrapperImpl<ConsumerGroupsInner> implements ConsumerGroups {
+    private final EventHubManager manager;
+
+    ConsumerGroupsImpl(EventHubManager manager) {
+        super(manager.inner().consumerGroups());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ConsumerGroupImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ConsumerGroupImpl wrapModel(ConsumerGroupInner inner) {
+        return  new ConsumerGroupImpl(inner, manager());
+    }
+
+    private ConsumerGroupImpl wrapModel(String name) {
+        return new ConsumerGroupImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ConsumerGroup> listByEventHubAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        ConsumerGroupsInner client = this.inner();
+        return client.listByEventHubAsync(resourceGroupName, namespaceName, eventHubName)
+        .flatMapIterable(new Func1<Page<ConsumerGroupInner>, Iterable<ConsumerGroupInner>>() {
+            @Override
+            public Iterable<ConsumerGroupInner> call(Page<ConsumerGroupInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ConsumerGroupInner, ConsumerGroup>() {
+            @Override
+            public ConsumerGroup call(ConsumerGroupInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    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>() {
+            @Override
+            public ConsumerGroup call(ConsumerGroupInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        ConsumerGroupsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toCompletable();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupsInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupsInner.java
new file mode 100644
index 000000000000..cf0227b13ec4
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/ConsumerGroupsInner.java
@@ -0,0 +1,865 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ConsumerGroups.
+ */
+public class ConsumerGroupsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ConsumerGroupsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ConsumerGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ConsumerGroupsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(ConsumerGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ConsumerGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ConsumerGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.ConsumerGroups createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups/{consumerGroupName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("consumerGroupName") String consumerGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ConsumerGroupInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.ConsumerGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups/{consumerGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("consumerGroupName") String consumerGroupName, @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.eventhub.v2017_04_01.ConsumerGroups get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups/{consumerGroupName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("consumerGroupName") String consumerGroupName, @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.eventhub.v2017_04_01.ConsumerGroups listByEventHub" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/consumergroups")
+        Observable<Response<ResponseBody>> listByEventHub(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$skip") Integer skip, @Query("$top") Integer top, @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.eventhub.v2017_04_01.ConsumerGroups listByEventHubNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByEventHubNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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 ConsumerGroupInner object if successful.
+     */
+    public ConsumerGroupInner createOrUpdate(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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<ConsumerGroupInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, final ServiceCallback<ConsumerGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupInner object
+     */
+    public Observable<ConsumerGroupInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).map(new Func1<ServiceResponse<ConsumerGroupInner>, ConsumerGroupInner>() {
+            @Override
+            public ConsumerGroupInner call(ServiceResponse<ConsumerGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupInner object
+     */
+    public Observable<ServiceResponse<ConsumerGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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.");
+        }
+        final String userMetadata = null;
+        ConsumerGroupInner parameters = new ConsumerGroupInner();
+        parameters.withUserMetadata(null);
+        return service.createOrUpdate(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConsumerGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConsumerGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConsumerGroupInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param userMetadata User Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.
+     * @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 ConsumerGroupInner object if successful.
+     */
+    public ConsumerGroupInner createOrUpdate(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, String userMetadata) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName, userMetadata).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param userMetadata User Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.
+     * @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<ConsumerGroupInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, String userMetadata, final ServiceCallback<ConsumerGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName, userMetadata), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param userMetadata User Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupInner object
+     */
+    public Observable<ConsumerGroupInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, String userMetadata) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName, userMetadata).map(new Func1<ServiceResponse<ConsumerGroupInner>, ConsumerGroupInner>() {
+            @Override
+            public ConsumerGroupInner call(ServiceResponse<ConsumerGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an Event Hubs consumer group as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @param userMetadata User Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupInner object
+     */
+    public Observable<ServiceResponse<ConsumerGroupInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, String userMetadata) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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.");
+        }
+        ConsumerGroupInner parameters = new ConsumerGroupInner();
+        parameters.withUserMetadata(userMetadata);
+        return service.createOrUpdate(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConsumerGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConsumerGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConsumerGroupInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConsumerGroupInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConsumerGroupInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConsumerGroupInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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
+     */
+    public void delete(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName), serviceCallback);
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a consumer group from the specified Event Hub and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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.delete(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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 ConsumerGroupInner object if successful.
+     */
+    public ConsumerGroupInner get(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group 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<ConsumerGroupInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName, final ServiceCallback<ConsumerGroupInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName), serviceCallback);
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupInner object
+     */
+    public Observable<ConsumerGroupInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName).map(new Func1<ServiceResponse<ConsumerGroupInner>, ConsumerGroupInner>() {
+            @Override
+            public ConsumerGroupInner call(ServiceResponse<ConsumerGroupInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a description for the specified consumer group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param consumerGroupName The consumer group name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ConsumerGroupInner object
+     */
+    public Observable<ServiceResponse<ConsumerGroupInner>> getWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (consumerGroupName == null) {
+            throw new IllegalArgumentException("Parameter consumerGroupName 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.get(resourceGroupName, namespaceName, eventHubName, consumerGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ConsumerGroupInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ConsumerGroupInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ConsumerGroupInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ConsumerGroupInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConsumerGroupInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ConsumerGroupInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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;ConsumerGroupInner&gt; object if successful.
+     */
+    public PagedList<ConsumerGroupInner> listByEventHub(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        ServiceResponse<Page<ConsumerGroupInner>> response = listByEventHubSinglePageAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single();
+        return new PagedList<ConsumerGroupInner>(response.body()) {
+            @Override
+            public Page<ConsumerGroupInner> nextPage(String nextPageLink) {
+                return listByEventHubNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<ConsumerGroupInner>> listByEventHubAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final ListOperationCallback<ConsumerGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByEventHubSinglePageAsync(resourceGroupName, namespaceName, eventHubName),
+            new Func1<String, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(String nextPageLink) {
+                    return listByEventHubNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ConsumerGroupInner&gt; object
+     */
+    public Observable<Page<ConsumerGroupInner>> listByEventHubAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listByEventHubWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName)
+            .map(new Func1<ServiceResponse<Page<ConsumerGroupInner>>, Page<ConsumerGroupInner>>() {
+                @Override
+                public Page<ConsumerGroupInner> call(ServiceResponse<Page<ConsumerGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ConsumerGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupInner>>> listByEventHubWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listByEventHubSinglePageAsync(resourceGroupName, namespaceName, eventHubName)
+            .concatMap(new Func1<ServiceResponse<Page<ConsumerGroupInner>>, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(ServiceResponse<Page<ConsumerGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByEventHubNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ConsumerGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupInner>>> listByEventHubSinglePageAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.");
+        }
+        final Integer skip = null;
+        final Integer top = null;
+        return service.listByEventHub(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), skip, top, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ConsumerGroupInner>> result = listByEventHubDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ConsumerGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @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;ConsumerGroupInner&gt; object if successful.
+     */
+    public PagedList<ConsumerGroupInner> listByEventHub(final String resourceGroupName, final String namespaceName, final String eventHubName, final Integer skip, final Integer top) {
+        ServiceResponse<Page<ConsumerGroupInner>> response = listByEventHubSinglePageAsync(resourceGroupName, namespaceName, eventHubName, skip, top).toBlocking().single();
+        return new PagedList<ConsumerGroupInner>(response.body()) {
+            @Override
+            public Page<ConsumerGroupInner> nextPage(String nextPageLink) {
+                return listByEventHubNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @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<ConsumerGroupInner>> listByEventHubAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final Integer skip, final Integer top, final ListOperationCallback<ConsumerGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByEventHubSinglePageAsync(resourceGroupName, namespaceName, eventHubName, skip, top),
+            new Func1<String, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(String nextPageLink) {
+                    return listByEventHubNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ConsumerGroupInner&gt; object
+     */
+    public Observable<Page<ConsumerGroupInner>> listByEventHubAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final Integer skip, final Integer top) {
+        return listByEventHubWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, skip, top)
+            .map(new Func1<ServiceResponse<Page<ConsumerGroupInner>>, Page<ConsumerGroupInner>>() {
+                @Override
+                public Page<ConsumerGroupInner> call(ServiceResponse<Page<ConsumerGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ConsumerGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupInner>>> listByEventHubWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final Integer skip, final Integer top) {
+        return listByEventHubSinglePageAsync(resourceGroupName, namespaceName, eventHubName, skip, top)
+            .concatMap(new Func1<ServiceResponse<Page<ConsumerGroupInner>>, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(ServiceResponse<Page<ConsumerGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByEventHubNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+    ServiceResponse<PageImpl<ConsumerGroupInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<ConsumerGroupInner>> * @param namespaceName The Namespace name
+    ServiceResponse<PageImpl<ConsumerGroupInner>> * @param eventHubName The Event Hub name
+    ServiceResponse<PageImpl<ConsumerGroupInner>> * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+    ServiceResponse<PageImpl<ConsumerGroupInner>> * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ConsumerGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupInner>>> listByEventHubSinglePageAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final Integer skip, final Integer top) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.listByEventHub(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), skip, top, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ConsumerGroupInner>> result = listByEventHubDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ConsumerGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ConsumerGroupInner>> listByEventHubDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ConsumerGroupInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ConsumerGroupInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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;ConsumerGroupInner&gt; object if successful.
+     */
+    public PagedList<ConsumerGroupInner> listByEventHubNext(final String nextPageLink) {
+        ServiceResponse<Page<ConsumerGroupInner>> response = listByEventHubNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ConsumerGroupInner>(response.body()) {
+            @Override
+            public Page<ConsumerGroupInner> nextPage(String nextPageLink) {
+                return listByEventHubNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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<ConsumerGroupInner>> listByEventHubNextAsync(final String nextPageLink, final ServiceFuture<List<ConsumerGroupInner>> serviceFuture, final ListOperationCallback<ConsumerGroupInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByEventHubNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(String nextPageLink) {
+                    return listByEventHubNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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;ConsumerGroupInner&gt; object
+     */
+    public Observable<Page<ConsumerGroupInner>> listByEventHubNextAsync(final String nextPageLink) {
+        return listByEventHubNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ConsumerGroupInner>>, Page<ConsumerGroupInner>>() {
+                @Override
+                public Page<ConsumerGroupInner> call(ServiceResponse<Page<ConsumerGroupInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the 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;ConsumerGroupInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupInner>>> listByEventHubNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByEventHubNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ConsumerGroupInner>>, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(ServiceResponse<Page<ConsumerGroupInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByEventHubNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the consumer groups in a Namespace. An empty feed is returned if no consumer group exists in the Namespace.
+     *
+    ServiceResponse<PageImpl<ConsumerGroupInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ConsumerGroupInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ConsumerGroupInner>>> listByEventHubNextSinglePageAsync(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.listByEventHubNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ConsumerGroupInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ConsumerGroupInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ConsumerGroupInner>> result = listByEventHubNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ConsumerGroupInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ConsumerGroupInner>> listByEventHubNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ConsumerGroupInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ConsumerGroupInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigNamespaceAuthorizationRuleImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigNamespaceAuthorizationRuleImpl.java
new file mode 100644
index 000000000000..8debc3a49070
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigNamespaceAuthorizationRuleImpl.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigNamespaceAuthorizationRule;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessRights;
+
+class DisasterRecoveryConfigNamespaceAuthorizationRuleImpl extends IndexableRefreshableWrapperImpl<DisasterRecoveryConfigNamespaceAuthorizationRule, AuthorizationRuleInner> implements DisasterRecoveryConfigNamespaceAuthorizationRule {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String alias;
+    private String authorizationRuleName;
+
+    DisasterRecoveryConfigNamespaceAuthorizationRuleImpl(AuthorizationRuleInner inner,  EventHubManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.alias = IdParsingUtils.getValueFromIdByName(inner.id(), "disasterRecoveryConfigs");
+        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "AuthorizationRules");
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<AuthorizationRuleInner> getInnerAsync() {
+        DisasterRecoveryConfigsInner client = this.manager().inner().disasterRecoveryConfigs();
+        return client.getAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.alias, this.authorizationRuleName);
+    }
+
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<AccessRights> rights() {
+        return this.inner().rights();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java
new file mode 100644
index 000000000000..a67c69f53795
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigs;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2017_04_01.CheckNameAvailabilityResult;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ArmDisasterRecovery;
+import com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigNamespaceAuthorizationRule;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessKeys;
+
+class DisasterRecoveryConfigsImpl extends WrapperImpl<DisasterRecoveryConfigsInner> implements DisasterRecoveryConfigs {
+    private final EventHubManager manager;
+
+    DisasterRecoveryConfigsImpl(EventHubManager manager) {
+        super(manager.inner().disasterRecoveryConfigs());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ArmDisasterRecoveryImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ArmDisasterRecoveryImpl wrapModel(ArmDisasterRecoveryInner inner) {
+        return  new ArmDisasterRecoveryImpl(inner, manager());
+    }
+
+    private ArmDisasterRecoveryImpl wrapModel(String name) {
+        return new ArmDisasterRecoveryImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String resourceGroupName, String namespaceName, String name) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.checkNameAvailabilityAsync(resourceGroupName, namespaceName, name)
+        .map(new Func1<CheckNameAvailabilityResultInner, CheckNameAvailabilityResult>() {
+            @Override
+            public CheckNameAvailabilityResult call(CheckNameAvailabilityResultInner inner) {
+                return new CheckNameAvailabilityResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable breakPairingAsync(String resourceGroupName, String namespaceName, String alias) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.breakPairingAsync(resourceGroupName, namespaceName, alias).toCompletable();
+    }
+
+    @Override
+    public Completable failOverAsync(String resourceGroupName, String namespaceName, String alias) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.failOverAsync(resourceGroupName, namespaceName, alias).toCompletable();
+    }
+
+    @Override
+    public Observable<ArmDisasterRecovery> listAsync(final String resourceGroupName, final String namespaceName) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.listAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<ArmDisasterRecoveryInner>, Iterable<ArmDisasterRecoveryInner>>() {
+            @Override
+            public Iterable<ArmDisasterRecoveryInner> call(Page<ArmDisasterRecoveryInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ArmDisasterRecoveryInner, ArmDisasterRecovery>() {
+            @Override
+            public ArmDisasterRecovery call(ArmDisasterRecoveryInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    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>() {
+            @Override
+            public ArmDisasterRecovery call(ArmDisasterRecoveryInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String namespaceName, String alias) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, namespaceName, alias).toCompletable();
+    }
+
+    private DisasterRecoveryConfigNamespaceAuthorizationRuleImpl wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(AuthorizationRuleInner inner) {
+        return  new DisasterRecoveryConfigNamespaceAuthorizationRuleImpl(inner, manager());
+    }
+
+    private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingDisasterRecoveryConfigsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String alias = IdParsingUtils.getValueFromIdByName(id, "disasterRecoveryConfigs");
+        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "AuthorizationRules");
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, alias, authorizationRuleName);
+    }
+
+    @Override
+    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>() {
+            @Override
+            public DisasterRecoveryConfigNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
+                return wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String alias) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.listAuthorizationRulesAsync(resourceGroupName, namespaceName, alias)
+        .flatMapIterable(new Func1<Page<AuthorizationRuleInner>, Iterable<AuthorizationRuleInner>>() {
+            @Override
+            public Iterable<AuthorizationRuleInner> call(Page<AuthorizationRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AuthorizationRuleInner, DisasterRecoveryConfigNamespaceAuthorizationRule>() {
+            @Override
+            public DisasterRecoveryConfigNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
+                return wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<AccessKeys> listKeysAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        DisasterRecoveryConfigsInner client = this.inner();
+        return client.listKeysAsync(resourceGroupName, namespaceName, alias, authorizationRuleName)
+        .map(new Func1<AccessKeysInner, AccessKeys>() {
+            @Override
+            public AccessKeys call(AccessKeysInner inner) {
+                return new AccessKeysImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigsInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigsInner.java
new file mode 100644
index 000000000000..6c21f787c732
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/DisasterRecoveryConfigsInner.java
@@ -0,0 +1,1358 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2017_04_01.CheckNameAvailabilityParameter;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in DisasterRecoveryConfigs.
+ */
+public class DisasterRecoveryConfigsInner {
+    /** The Retrofit service to perform REST calls. */
+    private DisasterRecoveryConfigsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of DisasterRecoveryConfigsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public DisasterRecoveryConfigsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(DisasterRecoveryConfigsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for DisasterRecoveryConfigs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface DisasterRecoveryConfigsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigs checkNameAvailability" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/CheckNameAvailability")
+        Observable<Response<ResponseBody>> checkNameAvailability(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckNameAvailabilityParameter parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigs list" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2017_04_01.DisasterRecoveryConfigs createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @Path("subscriptionId") String subscriptionId, @Body ArmDisasterRecoveryInner parameters, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs breakPairing" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}/breakPairing")
+        Observable<Response<ResponseBody>> breakPairing(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs failOver" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}/failover")
+        Observable<Response<ResponseBody>> failOver(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs listAuthorizationRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}/AuthorizationRules")
+        Observable<Response<ResponseBody>> listAuthorizationRules(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs getAuthorizationRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}/AuthorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> getAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs listKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/disasterRecoveryConfigs/{alias}/AuthorizationRules/{authorizationRuleName}/listKeys")
+        Observable<Response<ResponseBody>> listKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("alias") String alias, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.DisasterRecoveryConfigs listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@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.eventhub.v2017_04_01.DisasterRecoveryConfigs listAuthorizationRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAuthorizationRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param name Name to check the namespace name availability
+     * @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 CheckNameAvailabilityResultInner object if successful.
+     */
+    public CheckNameAvailabilityResultInner checkNameAvailability(String resourceGroupName, String namespaceName, String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(resourceGroupName, namespaceName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param name Name to check the namespace name availability
+     * @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<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String resourceGroupName, String namespaceName, String name, final ServiceCallback<CheckNameAvailabilityResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkNameAvailabilityWithServiceResponseAsync(resourceGroupName, namespaceName, name), serviceCallback);
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String resourceGroupName, String namespaceName, String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(resourceGroupName, namespaceName, name).map(new Func1<ServiceResponse<CheckNameAvailabilityResultInner>, CheckNameAvailabilityResultInner>() {
+            @Override
+            public CheckNameAvailabilityResultInner call(ServiceResponse<CheckNameAvailabilityResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> checkNameAvailabilityWithServiceResponseAsync(String resourceGroupName, String namespaceName, String name) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        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.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        CheckNameAvailabilityParameter parameters = new CheckNameAvailabilityParameter();
+        parameters.withName(name);
+        return service.checkNameAvailability(this.client.subscriptionId(), resourceGroupName, namespaceName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CheckNameAvailabilityResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CheckNameAvailabilityResultInner> clientResponse = checkNameAvailabilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CheckNameAvailabilityResultInner> checkNameAvailabilityDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CheckNameAvailabilityResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CheckNameAvailabilityResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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;ArmDisasterRecoveryInner&gt; object if successful.
+     */
+    public PagedList<ArmDisasterRecoveryInner> list(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<ArmDisasterRecoveryInner>> response = listSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<ArmDisasterRecoveryInner>(response.body()) {
+            @Override
+            public Page<ArmDisasterRecoveryInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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<ArmDisasterRecoveryInner>> listAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<ArmDisasterRecoveryInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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;ArmDisasterRecoveryInner&gt; object
+     */
+    public Observable<Page<ArmDisasterRecoveryInner>> listAsync(final String resourceGroupName, final String namespaceName) {
+        return listWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<ArmDisasterRecoveryInner>>, Page<ArmDisasterRecoveryInner>>() {
+                @Override
+                public Page<ArmDisasterRecoveryInner> call(ServiceResponse<Page<ArmDisasterRecoveryInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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;ArmDisasterRecoveryInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> listWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<ArmDisasterRecoveryInner>>, Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> call(ServiceResponse<Page<ArmDisasterRecoveryInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+    ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ArmDisasterRecoveryInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> listSinglePageAsync(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.list(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ArmDisasterRecoveryInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ArmDisasterRecoveryInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ArmDisasterRecoveryInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a new Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param parameters Parameters required to create an Alias(Disaster Recovery configuration)
+     * @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 ArmDisasterRecoveryInner object if successful.
+     */
+    public ArmDisasterRecoveryInner createOrUpdate(String resourceGroupName, String namespaceName, String alias, ArmDisasterRecoveryInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, alias, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a new Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param parameters Parameters required to create an Alias(Disaster Recovery configuration)
+     * @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<ArmDisasterRecoveryInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String alias, ArmDisasterRecoveryInner parameters, final ServiceCallback<ArmDisasterRecoveryInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, alias, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a new Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param parameters Parameters required to create an Alias(Disaster Recovery configuration)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ArmDisasterRecoveryInner object
+     */
+    public Observable<ArmDisasterRecoveryInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String alias, ArmDisasterRecoveryInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, alias, parameters).map(new Func1<ServiceResponse<ArmDisasterRecoveryInner>, ArmDisasterRecoveryInner>() {
+            @Override
+            public ArmDisasterRecoveryInner call(ServiceResponse<ArmDisasterRecoveryInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a new Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param parameters Parameters required to create an Alias(Disaster Recovery configuration)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ArmDisasterRecoveryInner object
+     */
+    public Observable<ServiceResponse<ArmDisasterRecoveryInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias, ArmDisasterRecoveryInner parameters) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(resourceGroupName, namespaceName, alias, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ArmDisasterRecoveryInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ArmDisasterRecoveryInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ArmDisasterRecoveryInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ArmDisasterRecoveryInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ArmDisasterRecoveryInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ArmDisasterRecoveryInner>() { }.getType())
+                .register(201, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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
+     */
+    public void delete(String resourceGroupName, String namespaceName, String alias) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName, alias).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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<Void> deleteAsync(String resourceGroupName, String namespaceName, String alias, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName, alias), serviceCallback);
+    }
+
+    /**
+     * Deletes an Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName, String alias) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName, alias).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an Alias(Disaster Recovery configuration).
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias 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.delete(resourceGroupName, namespaceName, alias, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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 ArmDisasterRecoveryInner object if successful.
+     */
+    public ArmDisasterRecoveryInner get(String resourceGroupName, String namespaceName, String alias) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, alias).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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<ArmDisasterRecoveryInner> getAsync(String resourceGroupName, String namespaceName, String alias, final ServiceCallback<ArmDisasterRecoveryInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, namespaceName, alias), serviceCallback);
+    }
+
+    /**
+     * Retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ArmDisasterRecoveryInner object
+     */
+    public Observable<ArmDisasterRecoveryInner> getAsync(String resourceGroupName, String namespaceName, String alias) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, alias).map(new Func1<ServiceResponse<ArmDisasterRecoveryInner>, ArmDisasterRecoveryInner>() {
+            @Override
+            public ArmDisasterRecoveryInner call(ServiceResponse<ArmDisasterRecoveryInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves Alias(Disaster Recovery configuration) for primary or secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ArmDisasterRecoveryInner object
+     */
+    public Observable<ServiceResponse<ArmDisasterRecoveryInner>> getWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias 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.get(resourceGroupName, namespaceName, alias, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ArmDisasterRecoveryInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ArmDisasterRecoveryInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ArmDisasterRecoveryInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ArmDisasterRecoveryInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ArmDisasterRecoveryInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ArmDisasterRecoveryInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * This operation disables the Disaster Recovery and stops replicating changes from primary to secondary namespaces.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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
+     */
+    public void breakPairing(String resourceGroupName, String namespaceName, String alias) {
+        breakPairingWithServiceResponseAsync(resourceGroupName, namespaceName, alias).toBlocking().single().body();
+    }
+
+    /**
+     * This operation disables the Disaster Recovery and stops replicating changes from primary to secondary namespaces.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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<Void> breakPairingAsync(String resourceGroupName, String namespaceName, String alias, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(breakPairingWithServiceResponseAsync(resourceGroupName, namespaceName, alias), serviceCallback);
+    }
+
+    /**
+     * This operation disables the Disaster Recovery and stops replicating changes from primary to secondary namespaces.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> breakPairingAsync(String resourceGroupName, String namespaceName, String alias) {
+        return breakPairingWithServiceResponseAsync(resourceGroupName, namespaceName, alias).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * This operation disables the Disaster Recovery and stops replicating changes from primary to secondary namespaces.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> breakPairingWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias 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.breakPairing(resourceGroupName, namespaceName, alias, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = breakPairingDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> breakPairingDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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
+     */
+    public void failOver(String resourceGroupName, String namespaceName, String alias) {
+        failOverWithServiceResponseAsync(resourceGroupName, namespaceName, alias).toBlocking().single().body();
+    }
+
+    /**
+     * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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<Void> failOverAsync(String resourceGroupName, String namespaceName, String alias, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(failOverWithServiceResponseAsync(resourceGroupName, namespaceName, alias), serviceCallback);
+    }
+
+    /**
+     * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> failOverAsync(String resourceGroupName, String namespaceName, String alias) {
+        return failOverWithServiceResponseAsync(resourceGroupName, namespaceName, alias).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> failOverWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias 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.failOver(resourceGroupName, namespaceName, alias, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = failOverDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> failOverDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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;AuthorizationRuleInner&gt; object if successful.
+     */
+    public PagedList<AuthorizationRuleInner> listAuthorizationRules(final String resourceGroupName, final String namespaceName, final String alias) {
+        ServiceResponse<Page<AuthorizationRuleInner>> response = listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, alias).toBlocking().single();
+        return new PagedList<AuthorizationRuleInner>(response.body()) {
+            @Override
+            public Page<AuthorizationRuleInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration 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<AuthorizationRuleInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String alias, final ListOperationCallback<AuthorizationRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, alias),
+            new Func1<String, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AuthorizationRuleInner&gt; object
+     */
+    public Observable<Page<AuthorizationRuleInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String alias) {
+        return listAuthorizationRulesWithServiceResponseAsync(resourceGroupName, namespaceName, alias)
+            .map(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Page<AuthorizationRuleInner>>() {
+                @Override
+                public Page<AuthorizationRuleInner> call(ServiceResponse<Page<AuthorizationRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AuthorizationRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final String alias) {
+        return listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, alias)
+            .concatMap(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(ServiceResponse<Page<AuthorizationRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param namespaceName The Namespace name
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param alias The Disaster Recovery configuration name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AuthorizationRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesSinglePageAsync(final String resourceGroupName, final String namespaceName, final String alias) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias 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.listAuthorizationRules(resourceGroupName, namespaceName, alias, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AuthorizationRuleInner>> result = listAuthorizationRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AuthorizationRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AuthorizationRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AuthorizationRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule 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 AuthorizationRuleInner object if successful.
+     */
+    public AuthorizationRuleInner getAuthorizationRule(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, alias, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule 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<AuthorizationRuleInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName, final ServiceCallback<AuthorizationRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, alias, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<AuthorizationRuleInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, alias, authorizationRuleName).map(new Func1<ServiceResponse<AuthorizationRuleInner>, AuthorizationRuleInner>() {
+            @Override
+            public AuthorizationRuleInner call(ServiceResponse<AuthorizationRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<ServiceResponse<AuthorizationRuleInner>> getAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.getAuthorizationRule(resourceGroupName, namespaceName, alias, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AuthorizationRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AuthorizationRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AuthorizationRuleInner> clientResponse = getAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AuthorizationRuleInner> getAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AuthorizationRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AuthorizationRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule 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 AccessKeysInner object if successful.
+     */
+    public AccessKeysInner listKeys(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, alias, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule 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<AccessKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName, final ServiceCallback<AccessKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, alias, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<AccessKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, alias, authorizationRuleName).map(new Func1<ServiceResponse<AccessKeysInner>, AccessKeysInner>() {
+            @Override
+            public AccessKeysInner call(ServiceResponse<AccessKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param alias The Disaster Recovery configuration name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<ServiceResponse<AccessKeysInner>> listKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
+        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 (alias == null) {
+            throw new IllegalArgumentException("Parameter alias is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.listKeys(resourceGroupName, namespaceName, alias, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AccessKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AccessKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AccessKeysInner> clientResponse = listKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AccessKeysInner> listKeysDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AccessKeysInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AccessKeysInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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;ArmDisasterRecoveryInner&gt; object if successful.
+     */
+    public PagedList<ArmDisasterRecoveryInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ArmDisasterRecoveryInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ArmDisasterRecoveryInner>(response.body()) {
+            @Override
+            public Page<ArmDisasterRecoveryInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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<ArmDisasterRecoveryInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ArmDisasterRecoveryInner>> serviceFuture, final ListOperationCallback<ArmDisasterRecoveryInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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;ArmDisasterRecoveryInner&gt; object
+     */
+    public Observable<Page<ArmDisasterRecoveryInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ArmDisasterRecoveryInner>>, Page<ArmDisasterRecoveryInner>>() {
+                @Override
+                public Page<ArmDisasterRecoveryInner> call(ServiceResponse<Page<ArmDisasterRecoveryInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+     * @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;ArmDisasterRecoveryInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ArmDisasterRecoveryInner>>, Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> call(ServiceResponse<Page<ArmDisasterRecoveryInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all Alias(Disaster Recovery configurations).
+     *
+    ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ArmDisasterRecoveryInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ArmDisasterRecoveryInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ArmDisasterRecoveryInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ArmDisasterRecoveryInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ArmDisasterRecoveryInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ArmDisasterRecoveryInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object if successful.
+     */
+    public PagedList<AuthorizationRuleInner> listAuthorizationRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<AuthorizationRuleInner>> response = listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AuthorizationRuleInner>(response.body()) {
+            @Override
+            public Page<AuthorizationRuleInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of authorization rules 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<AuthorizationRuleInner>> listAuthorizationRulesNextAsync(final String nextPageLink, final ServiceFuture<List<AuthorizationRuleInner>> serviceFuture, final ListOperationCallback<AuthorizationRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<Page<AuthorizationRuleInner>> listAuthorizationRulesNextAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Page<AuthorizationRuleInner>>() {
+                @Override
+                public Page<AuthorizationRuleInner> call(ServiceResponse<Page<AuthorizationRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(ServiceResponse<Page<AuthorizationRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AuthorizationRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesNextSinglePageAsync(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.listAuthorizationRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AuthorizationRuleInner>> result = listAuthorizationRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AuthorizationRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRulesNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AuthorizationRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AuthorizationRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EHNamespaceImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EHNamespaceImpl.java
new file mode 100644
index 000000000000..48f60deb7c66
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EHNamespaceImpl.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EHNamespace;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Sku;
+import org.joda.time.DateTime;
+
+class EHNamespaceImpl extends GroupableResourceCoreImpl<EHNamespace, EHNamespaceInner, EHNamespaceImpl, EventHubManager> implements EHNamespace, EHNamespace.Definition, EHNamespace.Update {
+    EHNamespaceImpl(String name, EHNamespaceInner inner, EventHubManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<EHNamespace> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<EHNamespace> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.updateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<EHNamespaceInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public Boolean isAutoInflateEnabled() {
+        return this.inner().isAutoInflateEnabled();
+    }
+
+    @Override
+    public Boolean kafkaEnabled() {
+        return this.inner().kafkaEnabled();
+    }
+
+    @Override
+    public Integer maximumThroughputUnits() {
+        return this.inner().maximumThroughputUnits();
+    }
+
+    @Override
+    public String metricId() {
+        return this.inner().metricId();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String serviceBusEndpoint() {
+        return this.inner().serviceBusEndpoint();
+    }
+
+    @Override
+    public Sku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public EHNamespaceImpl withIsAutoInflateEnabled(Boolean isAutoInflateEnabled) {
+        this.inner().withIsAutoInflateEnabled(isAutoInflateEnabled);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withKafkaEnabled(Boolean kafkaEnabled) {
+        this.inner().withKafkaEnabled(kafkaEnabled);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withMaximumThroughputUnits(Integer maximumThroughputUnits) {
+        this.inner().withMaximumThroughputUnits(maximumThroughputUnits);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withSku(Sku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EHNamespaceInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EHNamespaceInner.java
new file mode 100644
index 000000000000..b998d38cf329
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EHNamespaceInner.java
@@ -0,0 +1,206 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.Sku;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Single Namespace item in List or Get Operation.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class EHNamespaceInner extends Resource {
+    /**
+     * Properties of sku resource.
+     */
+    @JsonProperty(value = "sku")
+    private Sku sku;
+
+    /**
+     * Provisioning state of the Namespace.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * The time the Namespace was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * The time the Namespace was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * Endpoint you can use to perform Service Bus operations.
+     */
+    @JsonProperty(value = "properties.serviceBusEndpoint", access = JsonProperty.Access.WRITE_ONLY)
+    private String serviceBusEndpoint;
+
+    /**
+     * Identifier for Azure Insights metrics.
+     */
+    @JsonProperty(value = "properties.metricId", access = JsonProperty.Access.WRITE_ONLY)
+    private String metricId;
+
+    /**
+     * Value that indicates whether AutoInflate is enabled for eventhub
+     * namespace.
+     */
+    @JsonProperty(value = "properties.isAutoInflateEnabled")
+    private Boolean isAutoInflateEnabled;
+
+    /**
+     * Upper limit of throughput units when AutoInflate is enabled, value
+     * should be within 0 to 20 throughput units. ( '0' if AutoInflateEnabled =
+     * true).
+     */
+    @JsonProperty(value = "properties.maximumThroughputUnits")
+    private Integer maximumThroughputUnits;
+
+    /**
+     * Value that indicates whether Kafka is enabled for eventhub namespace.
+     */
+    @JsonProperty(value = "properties.kafkaEnabled")
+    private Boolean kafkaEnabled;
+
+    /**
+     * Get properties of sku resource.
+     *
+     * @return the sku value
+     */
+    public Sku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set properties of sku resource.
+     *
+     * @param sku the sku value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withSku(Sku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get provisioning state of the Namespace.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the time the Namespace was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get the time the Namespace was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get endpoint you can use to perform Service Bus operations.
+     *
+     * @return the serviceBusEndpoint value
+     */
+    public String serviceBusEndpoint() {
+        return this.serviceBusEndpoint;
+    }
+
+    /**
+     * Get identifier for Azure Insights metrics.
+     *
+     * @return the metricId value
+     */
+    public String metricId() {
+        return this.metricId;
+    }
+
+    /**
+     * Get value that indicates whether AutoInflate is enabled for eventhub namespace.
+     *
+     * @return the isAutoInflateEnabled value
+     */
+    public Boolean isAutoInflateEnabled() {
+        return this.isAutoInflateEnabled;
+    }
+
+    /**
+     * Set value that indicates whether AutoInflate is enabled for eventhub namespace.
+     *
+     * @param isAutoInflateEnabled the isAutoInflateEnabled value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withIsAutoInflateEnabled(Boolean isAutoInflateEnabled) {
+        this.isAutoInflateEnabled = isAutoInflateEnabled;
+        return this;
+    }
+
+    /**
+     * Get upper limit of throughput units when AutoInflate is enabled, value should be within 0 to 20 throughput units. ( '0' if AutoInflateEnabled = true).
+     *
+     * @return the maximumThroughputUnits value
+     */
+    public Integer maximumThroughputUnits() {
+        return this.maximumThroughputUnits;
+    }
+
+    /**
+     * Set upper limit of throughput units when AutoInflate is enabled, value should be within 0 to 20 throughput units. ( '0' if AutoInflateEnabled = true).
+     *
+     * @param maximumThroughputUnits the maximumThroughputUnits value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withMaximumThroughputUnits(Integer maximumThroughputUnits) {
+        this.maximumThroughputUnits = maximumThroughputUnits;
+        return this;
+    }
+
+    /**
+     * Get value that indicates whether Kafka is enabled for eventhub namespace.
+     *
+     * @return the kafkaEnabled value
+     */
+    public Boolean kafkaEnabled() {
+        return this.kafkaEnabled;
+    }
+
+    /**
+     * Set value that indicates whether Kafka is enabled for eventhub namespace.
+     *
+     * @param kafkaEnabled the kafkaEnabled value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withKafkaEnabled(Boolean kafkaEnabled) {
+        this.kafkaEnabled = kafkaEnabled;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubManagementClientImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubManagementClientImpl.java
new file mode 100644
index 000000000000..c09fd0d4229b
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubManagementClientImpl.java
@@ -0,0 +1,266 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the EventHubManagementClientImpl class.
+ */
+public class EventHubManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. */
+    private String subscriptionId;
+
+    /**
+     * Gets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** Client API Version. */
+    private String apiVersion;
+
+    /**
+     * Gets Client API Version.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public EventHubManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The OperationsInner object to access its operations.
+     */
+    private OperationsInner operations;
+
+    /**
+     * Gets the OperationsInner object to access its operations.
+     * @return the OperationsInner object.
+     */
+    public OperationsInner operations() {
+        return this.operations;
+    }
+
+    /**
+     * The NamespacesInner object to access its operations.
+     */
+    private NamespacesInner namespaces;
+
+    /**
+     * Gets the NamespacesInner object to access its operations.
+     * @return the NamespacesInner object.
+     */
+    public NamespacesInner namespaces() {
+        return this.namespaces;
+    }
+
+    /**
+     * The DisasterRecoveryConfigsInner object to access its operations.
+     */
+    private DisasterRecoveryConfigsInner disasterRecoveryConfigs;
+
+    /**
+     * Gets the DisasterRecoveryConfigsInner object to access its operations.
+     * @return the DisasterRecoveryConfigsInner object.
+     */
+    public DisasterRecoveryConfigsInner disasterRecoveryConfigs() {
+        return this.disasterRecoveryConfigs;
+    }
+
+    /**
+     * The EventHubsInner object to access its operations.
+     */
+    private EventHubsInner eventHubs;
+
+    /**
+     * Gets the EventHubsInner object to access its operations.
+     * @return the EventHubsInner object.
+     */
+    public EventHubsInner eventHubs() {
+        return this.eventHubs;
+    }
+
+    /**
+     * The ConsumerGroupsInner object to access its operations.
+     */
+    private ConsumerGroupsInner consumerGroups;
+
+    /**
+     * Gets the ConsumerGroupsInner object to access its operations.
+     * @return the ConsumerGroupsInner object.
+     */
+    public ConsumerGroupsInner consumerGroups() {
+        return this.consumerGroups;
+    }
+
+    /**
+     * The RegionsInner object to access its operations.
+     */
+    private RegionsInner regions;
+
+    /**
+     * Gets the RegionsInner object to access its operations.
+     * @return the RegionsInner object.
+     */
+    public RegionsInner regions() {
+        return this.regions;
+    }
+
+    /**
+     * Initializes an instance of EventHubManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public EventHubManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of EventHubManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public EventHubManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of EventHubManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public EventHubManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2017-04-01";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.namespaces = new NamespacesInner(restClient().retrofit(), this);
+        this.disasterRecoveryConfigs = new DisasterRecoveryConfigsInner(restClient().retrofit(), this);
+        this.eventHubs = new EventHubsInner(restClient().retrofit(), this);
+        this.consumerGroups = new ConsumerGroupsInner(restClient().retrofit(), this);
+        this.regions = new RegionsInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "EventHubManagementClient", "2017-04-01");
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubManager.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubManager.java
new file mode 100644
index 000000000000..4f89fe426c85
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubManager.java
@@ -0,0 +1,159 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Operations;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces;
+import com.microsoft.azure.management.eventhub.v2017_04_01.DisasterRecoveryConfigs;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EventHubs;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ConsumerGroups;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Regions;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure EventHub resource management.
+ */
+public final class EventHubManager extends ManagerCore<EventHubManager, EventHubManagementClientImpl> {
+    private Operations operations;
+    private Namespaces namespaces;
+    private DisasterRecoveryConfigs disasterRecoveryConfigs;
+    private EventHubs eventHubs;
+    private ConsumerGroups consumerGroups;
+    private Regions regions;
+    /**
+    * Get a Configurable instance that can be used to create EventHubManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new EventHubManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of EventHubManager that exposes EventHub resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the EventHubManager
+    */
+    public static EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new EventHubManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of EventHubManager that exposes EventHub resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the EventHubManager
+    */
+    public static EventHubManager authenticate(RestClient restClient, String subscriptionId) {
+        return new EventHubManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of EventHubManager that exposes EventHub management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing EventHub management API entry points that work across subscriptions
+        */
+        EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+     * @return Entry point to manage Namespaces.
+     */
+    public Namespaces namespaces() {
+        if (this.namespaces == null) {
+            this.namespaces = new NamespacesImpl(this);
+        }
+        return this.namespaces;
+    }
+
+    /**
+     * @return Entry point to manage DisasterRecoveryConfigs.
+     */
+    public DisasterRecoveryConfigs disasterRecoveryConfigs() {
+        if (this.disasterRecoveryConfigs == null) {
+            this.disasterRecoveryConfigs = new DisasterRecoveryConfigsImpl(this);
+        }
+        return this.disasterRecoveryConfigs;
+    }
+
+    /**
+     * @return Entry point to manage EventHubs.
+     */
+    public EventHubs eventHubs() {
+        if (this.eventHubs == null) {
+            this.eventHubs = new EventHubsImpl(this);
+        }
+        return this.eventHubs;
+    }
+
+    /**
+     * @return Entry point to manage ConsumerGroups.
+     */
+    public ConsumerGroups consumerGroups() {
+        if (this.consumerGroups == null) {
+            this.consumerGroups = new ConsumerGroupsImpl(this);
+        }
+        return this.consumerGroups;
+    }
+
+    /**
+     * @return Entry point to manage Regions.
+     */
+    public Regions regions() {
+        if (this.regions == null) {
+            this.regions = new RegionsImpl(this);
+        }
+        return this.regions;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return EventHubManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private EventHubManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new EventHubManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubsImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubsImpl.java
new file mode 100644
index 000000000000..8b9186fe5a81
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubsImpl.java
@@ -0,0 +1,166 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EventHubs;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Eventhub;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EventhubNamespaceAuthorizationRule;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessKeys;
+import com.microsoft.azure.management.eventhub.v2017_04_01.RegenerateAccessKeyParameters;
+
+class EventHubsImpl extends WrapperImpl<EventHubsInner> implements EventHubs {
+    private final EventHubManager manager;
+
+    EventHubsImpl(EventHubManager manager) {
+        super(manager.inner().eventHubs());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public EventhubImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private EventhubImpl wrapModel(EventhubInner inner) {
+        return  new EventhubImpl(inner, manager());
+    }
+
+    private EventhubImpl wrapModel(String name) {
+        return new EventhubImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<Eventhub> listByNamespaceAsync(final String resourceGroupName, final String namespaceName) {
+        EventHubsInner client = this.inner();
+        return client.listByNamespaceAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<EventhubInner>, Iterable<EventhubInner>>() {
+            @Override
+            public Iterable<EventhubInner> call(Page<EventhubInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EventhubInner, Eventhub>() {
+            @Override
+            public Eventhub call(EventhubInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    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>() {
+            @Override
+            public Eventhub call(EventhubInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        EventHubsInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, namespaceName, eventHubName).toCompletable();
+    }
+
+    @Override
+    public EventhubNamespaceAuthorizationRuleImpl defineAuthorizationRule(String name) {
+        return wrapAuthorizationRuleModel(name);
+    }
+
+    private EventhubNamespaceAuthorizationRuleImpl wrapAuthorizationRuleModel(String name) {
+        return new EventhubNamespaceAuthorizationRuleImpl(name, this.manager());
+    }
+
+    private EventhubNamespaceAuthorizationRuleImpl wrapEventhubNamespaceAuthorizationRuleModel(AuthorizationRuleInner inner) {
+        return  new EventhubNamespaceAuthorizationRuleImpl(inner, manager());
+    }
+
+    private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingEventHubsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String eventHubName = IdParsingUtils.getValueFromIdByName(id, "eventhubs");
+        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "authorizationRules");
+        EventHubsInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName);
+    }
+
+    @Override
+    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>() {
+            @Override
+            public EventhubNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
+                return wrapEventhubNamespaceAuthorizationRuleModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<EventhubNamespaceAuthorizationRule> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        EventHubsInner client = this.inner();
+        return client.listAuthorizationRulesAsync(resourceGroupName, namespaceName, eventHubName)
+        .flatMapIterable(new Func1<Page<AuthorizationRuleInner>, Iterable<AuthorizationRuleInner>>() {
+            @Override
+            public Iterable<AuthorizationRuleInner> call(Page<AuthorizationRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AuthorizationRuleInner, EventhubNamespaceAuthorizationRule>() {
+            @Override
+            public EventhubNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
+                return wrapEventhubNamespaceAuthorizationRuleModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.deleteAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toCompletable();
+    }
+
+    @Override
+    public Observable<AccessKeys> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        EventHubsInner client = this.inner();
+        return client.listKeysAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
+        .map(new Func1<AccessKeysInner, AccessKeys>() {
+            @Override
+            public AccessKeys call(AccessKeysInner inner) {
+                return new AccessKeysImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        EventHubsInner client = this.inner();
+        return client.regenerateKeysAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters)
+        .map(new Func1<AccessKeysInner, AccessKeys>() {
+            @Override
+            public AccessKeys call(AccessKeysInner inner) {
+                return new AccessKeysImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubsInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubsInner.java
new file mode 100644
index 000000000000..2dd41067ed02
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventHubsInner.java
@@ -0,0 +1,1526 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessRights;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ErrorResponseException;
+import com.microsoft.azure.management.eventhub.v2017_04_01.RegenerateAccessKeyParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in EventHubs.
+ */
+public class EventHubsInner {
+    /** The Retrofit service to perform REST calls. */
+    private EventHubsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of EventHubsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public EventHubsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(EventHubsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for EventHubs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface EventHubsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.EventHubs listByNamespace" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs")
+        Observable<Response<ResponseBody>> listByNamespace(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Query("$skip") Integer skip, @Query("$top") Integer top, @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.eventhub.v2017_04_01.EventHubs createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("subscriptionId") String subscriptionId, @Body EventhubInner parameters, @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.eventhub.v2017_04_01.EventHubs delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2017_04_01.EventHubs get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2017_04_01.EventHubs listAuthorizationRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules")
+        Observable<Response<ResponseBody>> listAuthorizationRules(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @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.eventhub.v2017_04_01.EventHubs createOrUpdateAuthorizationRule" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdateAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body AuthorizationRuleInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.EventHubs getAuthorizationRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> getAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.EventHubs deleteAuthorizationRule" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.EventHubs listKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/ListKeys")
+        Observable<Response<ResponseBody>> listKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.EventHubs regenerateKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}/regenerateKeys")
+        Observable<Response<ResponseBody>> regenerateKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Body RegenerateAccessKeyParameters parameters, @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.eventhub.v2017_04_01.EventHubs listByNamespaceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByNamespaceNext(@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.eventhub.v2017_04_01.EventHubs listAuthorizationRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAuthorizationRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventhubInner&gt; object if successful.
+     */
+    public PagedList<EventhubInner> listByNamespace(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<EventhubInner>> response = listByNamespaceSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<EventhubInner>(response.body()) {
+            @Override
+            public Page<EventhubInner> nextPage(String nextPageLink) {
+                return listByNamespaceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Event Hubs in 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<EventhubInner>> listByNamespaceAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<EventhubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByNamespaceSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(String nextPageLink) {
+                    return listByNamespaceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventhubInner&gt; object
+     */
+    public Observable<Page<EventhubInner>> listByNamespaceAsync(final String resourceGroupName, final String namespaceName) {
+        return listByNamespaceWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<EventhubInner>>, Page<EventhubInner>>() {
+                @Override
+                public Page<EventhubInner> call(ServiceResponse<Page<EventhubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventhubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EventhubInner>>> listByNamespaceWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listByNamespaceSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<EventhubInner>>, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(ServiceResponse<Page<EventhubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByNamespaceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in 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 PagedList&lt;EventhubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EventhubInner>>> listByNamespaceSinglePageAsync(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.");
+        }
+        final Integer skip = null;
+        final Integer top = null;
+        return service.listByNamespace(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), skip, top, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EventhubInner>> result = listByNamespaceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EventhubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @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;EventhubInner&gt; object if successful.
+     */
+    public PagedList<EventhubInner> listByNamespace(final String resourceGroupName, final String namespaceName, final Integer skip, final Integer top) {
+        ServiceResponse<Page<EventhubInner>> response = listByNamespaceSinglePageAsync(resourceGroupName, namespaceName, skip, top).toBlocking().single();
+        return new PagedList<EventhubInner>(response.body()) {
+            @Override
+            public Page<EventhubInner> nextPage(String nextPageLink) {
+                return listByNamespaceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @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<EventhubInner>> listByNamespaceAsync(final String resourceGroupName, final String namespaceName, final Integer skip, final Integer top, final ListOperationCallback<EventhubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByNamespaceSinglePageAsync(resourceGroupName, namespaceName, skip, top),
+            new Func1<String, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(String nextPageLink) {
+                    return listByNamespaceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EventhubInner&gt; object
+     */
+    public Observable<Page<EventhubInner>> listByNamespaceAsync(final String resourceGroupName, final String namespaceName, final Integer skip, final Integer top) {
+        return listByNamespaceWithServiceResponseAsync(resourceGroupName, namespaceName, skip, top)
+            .map(new Func1<ServiceResponse<Page<EventhubInner>>, Page<EventhubInner>>() {
+                @Override
+                public Page<EventhubInner> call(ServiceResponse<Page<EventhubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+     * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EventhubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EventhubInner>>> listByNamespaceWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final Integer skip, final Integer top) {
+        return listByNamespaceSinglePageAsync(resourceGroupName, namespaceName, skip, top)
+            .concatMap(new Func1<ServiceResponse<Page<EventhubInner>>, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(ServiceResponse<Page<EventhubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByNamespaceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+    ServiceResponse<PageImpl<EventhubInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<EventhubInner>> * @param namespaceName The Namespace name
+    ServiceResponse<PageImpl<EventhubInner>> * @param skip Skip is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skip parameter that specifies a starting point to use for subsequent calls.
+    ServiceResponse<PageImpl<EventhubInner>> * @param top May be used to limit the number of results to the most recent N usageDetails.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EventhubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EventhubInner>>> listByNamespaceSinglePageAsync(final String resourceGroupName, final String namespaceName, final Integer skip, final Integer top) {
+        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.listByNamespace(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), skip, top, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EventhubInner>> result = listByNamespaceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EventhubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EventhubInner>> listByNamespaceDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EventhubInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EventhubInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @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 EventhubInner object if successful.
+     */
+    public EventhubInner createOrUpdate(String resourceGroupName, String namespaceName, String eventHubName, EventhubInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @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<EventhubInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, EventhubInner parameters, final ServiceCallback<EventhubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventhubInner object
+     */
+    public Observable<EventhubInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, String eventHubName, EventhubInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, parameters).map(new Func1<ServiceResponse<EventhubInner>, EventhubInner>() {
+            @Override
+            public EventhubInner call(ServiceResponse<EventhubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a new Event Hub as a nested resource within a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param parameters Parameters supplied to create an Event Hub resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventhubInner object
+     */
+    public Observable<ServiceResponse<EventhubInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, EventhubInner parameters) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EventhubInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EventhubInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EventhubInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EventhubInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EventhubInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EventhubInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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
+     */
+    public void delete(String resourceGroupName, String namespaceName, String eventHubName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName), serviceCallback);
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an Event Hub from the specified Namespace and resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.delete(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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 EventhubInner object if successful.
+     */
+    public EventhubInner get(String resourceGroupName, String namespaceName, String eventHubName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<EventhubInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName, final ServiceCallback<EventhubInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName), serviceCallback);
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventhubInner object
+     */
+    public Observable<EventhubInner> getAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        return getWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName).map(new Func1<ServiceResponse<EventhubInner>, EventhubInner>() {
+            @Override
+            public EventhubInner call(ServiceResponse<EventhubInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an Event Hubs description for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EventhubInner object
+     */
+    public Observable<ServiceResponse<EventhubInner>> getWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.get(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EventhubInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EventhubInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EventhubInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EventhubInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EventhubInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EventhubInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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;AuthorizationRuleInner&gt; object if successful.
+     */
+    public PagedList<AuthorizationRuleInner> listAuthorizationRules(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        ServiceResponse<Page<AuthorizationRuleInner>> response = listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, eventHubName).toBlocking().single();
+        return new PagedList<AuthorizationRuleInner>(response.body()) {
+            @Override
+            public Page<AuthorizationRuleInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub 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<AuthorizationRuleInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName, final ListOperationCallback<AuthorizationRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, eventHubName),
+            new Func1<String, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AuthorizationRuleInner&gt; object
+     */
+    public Observable<Page<AuthorizationRuleInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listAuthorizationRulesWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName)
+            .map(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Page<AuthorizationRuleInner>>() {
+                @Override
+                public Page<AuthorizationRuleInner> call(ServiceResponse<Page<AuthorizationRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AuthorizationRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        return listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName, eventHubName)
+            .concatMap(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(ServiceResponse<Page<AuthorizationRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param namespaceName The Namespace name
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param eventHubName The Event Hub name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AuthorizationRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesSinglePageAsync(final String resourceGroupName, final String namespaceName, final String eventHubName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName 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.listAuthorizationRules(resourceGroupName, namespaceName, eventHubName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AuthorizationRuleInner>> result = listAuthorizationRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AuthorizationRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AuthorizationRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AuthorizationRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @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 AuthorizationRuleInner object if successful.
+     */
+    public AuthorizationRuleInner createOrUpdateAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, List<AccessRights> rights) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, rights).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @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<AuthorizationRuleInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, List<AccessRights> rights, final ServiceCallback<AuthorizationRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, rights), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<AuthorizationRuleInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, List<AccessRights> rights) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, rights).map(new Func1<ServiceResponse<AuthorizationRuleInner>, AuthorizationRuleInner>() {
+            @Override
+            public AuthorizationRuleInner call(ServiceResponse<AuthorizationRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for the specified Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<ServiceResponse<AuthorizationRuleInner>> createOrUpdateAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, List<AccessRights> rights) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.");
+        }
+        if (rights == null) {
+            throw new IllegalArgumentException("Parameter rights is required and cannot be null.");
+        }
+        Validator.validate(rights);
+        AuthorizationRuleInner parameters = new AuthorizationRuleInner();
+        parameters.withRights(rights);
+        return service.createOrUpdateAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AuthorizationRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AuthorizationRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AuthorizationRuleInner> clientResponse = createOrUpdateAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AuthorizationRuleInner> createOrUpdateAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AuthorizationRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AuthorizationRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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 AuthorizationRuleInner object if successful.
+     */
+    public AuthorizationRuleInner getAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<AuthorizationRuleInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<AuthorizationRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<AuthorizationRuleInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<AuthorizationRuleInner>, AuthorizationRuleInner>() {
+            @Override
+            public AuthorizationRuleInner call(ServiceResponse<AuthorizationRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an AuthorizationRule for an Event Hub by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<ServiceResponse<AuthorizationRuleInner>> getAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.getAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AuthorizationRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AuthorizationRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AuthorizationRuleInner> clientResponse = getAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AuthorizationRuleInner> getAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AuthorizationRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AuthorizationRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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
+     */
+    public void deleteAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an Event Hub AuthorizationRule.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.deleteAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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 AccessKeysInner object if successful.
+     */
+    public AccessKeysInner listKeys(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule 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<AccessKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<AccessKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<AccessKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<AccessKeysInner>, AccessKeysInner>() {
+            @Override
+            public AccessKeysInner call(ServiceResponse<AccessKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<ServiceResponse<AccessKeysInner>> listKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.listKeys(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AccessKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AccessKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AccessKeysInner> clientResponse = listKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AccessKeysInner> listKeysDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AccessKeysInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AccessKeysInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
+     * @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 AccessKeysInner object if successful.
+     */
+    public AccessKeysInner regenerateKeys(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
+     * @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<AccessKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, RegenerateAccessKeyParameters parameters, final ServiceCallback<AccessKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters), serviceCallback);
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<AccessKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, parameters).map(new Func1<ServiceResponse<AccessKeysInner>, AccessKeysInner>() {
+            @Override
+            public AccessKeysInner call(ServiceResponse<AccessKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Regenerates the ACS and SAS connection strings for the Event Hub.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param eventHubName The Event Hub name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters supplied to regenerate the AuthorizationRule Keys (PrimaryKey/SecondaryKey).
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<ServiceResponse<AccessKeysInner>> regenerateKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        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 (eventHubName == null) {
+            throw new IllegalArgumentException("Parameter eventHubName is required and cannot be null.");
+        }
+        if (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.regenerateKeys(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AccessKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AccessKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AccessKeysInner> clientResponse = regenerateKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AccessKeysInner> regenerateKeysDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AccessKeysInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AccessKeysInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventhubInner&gt; object if successful.
+     */
+    public PagedList<EventhubInner> listByNamespaceNext(final String nextPageLink) {
+        ServiceResponse<Page<EventhubInner>> response = listByNamespaceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EventhubInner>(response.body()) {
+            @Override
+            public Page<EventhubInner> nextPage(String nextPageLink) {
+                return listByNamespaceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the Event Hubs in 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<EventhubInner>> listByNamespaceNextAsync(final String nextPageLink, final ServiceFuture<List<EventhubInner>> serviceFuture, final ListOperationCallback<EventhubInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByNamespaceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(String nextPageLink) {
+                    return listByNamespaceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventhubInner&gt; object
+     */
+    public Observable<Page<EventhubInner>> listByNamespaceNextAsync(final String nextPageLink) {
+        return listByNamespaceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EventhubInner>>, Page<EventhubInner>>() {
+                @Override
+                public Page<EventhubInner> call(ServiceResponse<Page<EventhubInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in 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;EventhubInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EventhubInner>>> listByNamespaceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByNamespaceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EventhubInner>>, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(ServiceResponse<Page<EventhubInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByNamespaceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the Event Hubs in a Namespace.
+     *
+    ServiceResponse<PageImpl<EventhubInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EventhubInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EventhubInner>>> listByNamespaceNextSinglePageAsync(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.listByNamespaceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EventhubInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EventhubInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EventhubInner>> result = listByNamespaceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EventhubInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EventhubInner>> listByNamespaceNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EventhubInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EventhubInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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;AuthorizationRuleInner&gt; object if successful.
+     */
+    public PagedList<AuthorizationRuleInner> listAuthorizationRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<AuthorizationRuleInner>> response = listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AuthorizationRuleInner>(response.body()) {
+            @Override
+            public Page<AuthorizationRuleInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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<AuthorizationRuleInner>> listAuthorizationRulesNextAsync(final String nextPageLink, final ServiceFuture<List<AuthorizationRuleInner>> serviceFuture, final ListOperationCallback<AuthorizationRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<Page<AuthorizationRuleInner>> listAuthorizationRulesNextAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Page<AuthorizationRuleInner>>() {
+                @Override
+                public Page<AuthorizationRuleInner> call(ServiceResponse<Page<AuthorizationRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+     * @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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(ServiceResponse<Page<AuthorizationRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the authorization rules for an Event Hub.
+     *
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AuthorizationRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesNextSinglePageAsync(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.listAuthorizationRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AuthorizationRuleInner>> result = listAuthorizationRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AuthorizationRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRulesNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AuthorizationRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AuthorizationRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubImpl.java
new file mode 100644
index 000000000000..c9e9d15c2cae
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubImpl.java
@@ -0,0 +1,157 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.Eventhub;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EntityStatus;
+import com.microsoft.azure.management.eventhub.v2017_04_01.CaptureDescription;
+
+class EventhubImpl extends CreatableUpdatableImpl<Eventhub, EventhubInner, EventhubImpl> implements Eventhub, Eventhub.Definition, Eventhub.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String eventHubName;
+
+    EventhubImpl(String name, EventHubManager manager) {
+        super(name, new EventhubInner());
+        this.manager = manager;
+        // Set resource name
+        this.eventHubName = name;
+        //
+    }
+
+    EventhubImpl(EventhubInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.eventHubName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.eventHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "eventhubs");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<Eventhub> createResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<Eventhub> updateResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<EventhubInner> getInnerAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.getAsync(this.resourceGroupName, this.namespaceName, this.eventHubName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public CaptureDescription captureDescription() {
+        return this.inner().captureDescription();
+    }
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Long messageRetentionInDays() {
+        return this.inner().messageRetentionInDays();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Long partitionCount() {
+        return this.inner().partitionCount();
+    }
+
+    @Override
+    public List<String> partitionIds() {
+        return this.inner().partitionIds();
+    }
+
+    @Override
+    public EntityStatus status() {
+        return this.inner().status();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public EventhubImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+    @Override
+    public EventhubImpl withCaptureDescription(CaptureDescription captureDescription) {
+        this.inner().withCaptureDescription(captureDescription);
+        return this;
+    }
+
+    @Override
+    public EventhubImpl withMessageRetentionInDays(Long messageRetentionInDays) {
+        this.inner().withMessageRetentionInDays(messageRetentionInDays);
+        return this;
+    }
+
+    @Override
+    public EventhubImpl withPartitionCount(Long partitionCount) {
+        this.inner().withPartitionCount(partitionCount);
+        return this;
+    }
+
+    @Override
+    public EventhubImpl withStatus(EntityStatus status) {
+        this.inner().withStatus(status);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubInner.java
new file mode 100644
index 000000000000..2691d9669768
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubInner.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import java.util.List;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EntityStatus;
+import com.microsoft.azure.management.eventhub.v2017_04_01.CaptureDescription;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in List or Get Event Hub operation.
+ */
+@JsonFlatten
+public class EventhubInner extends ProxyResource {
+    /**
+     * Current number of shards on the Event Hub.
+     */
+    @JsonProperty(value = "properties.partitionIds", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> partitionIds;
+
+    /**
+     * Exact time the Event Hub was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * The exact time the message was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * Number of days to retain the events for this Event Hub, value should be
+     * 1 to 7 days.
+     */
+    @JsonProperty(value = "properties.messageRetentionInDays")
+    private Long messageRetentionInDays;
+
+    /**
+     * Number of partitions created for the Event Hub, allowed values are from
+     * 1 to 32 partitions.
+     */
+    @JsonProperty(value = "properties.partitionCount")
+    private Long partitionCount;
+
+    /**
+     * Enumerates the possible values for the status of the Event Hub. Possible
+     * values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled',
+     * 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     */
+    @JsonProperty(value = "properties.status")
+    private EntityStatus status;
+
+    /**
+     * Properties of capture description.
+     */
+    @JsonProperty(value = "properties.captureDescription")
+    private CaptureDescription captureDescription;
+
+    /**
+     * Get current number of shards on the Event Hub.
+     *
+     * @return the partitionIds value
+     */
+    public List<String> partitionIds() {
+        return this.partitionIds;
+    }
+
+    /**
+     * Get exact time the Event Hub was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get the exact time the message was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get number of days to retain the events for this Event Hub, value should be 1 to 7 days.
+     *
+     * @return the messageRetentionInDays value
+     */
+    public Long messageRetentionInDays() {
+        return this.messageRetentionInDays;
+    }
+
+    /**
+     * Set number of days to retain the events for this Event Hub, value should be 1 to 7 days.
+     *
+     * @param messageRetentionInDays the messageRetentionInDays value to set
+     * @return the EventhubInner object itself.
+     */
+    public EventhubInner withMessageRetentionInDays(Long messageRetentionInDays) {
+        this.messageRetentionInDays = messageRetentionInDays;
+        return this;
+    }
+
+    /**
+     * Get number of partitions created for the Event Hub, allowed values are from 1 to 32 partitions.
+     *
+     * @return the partitionCount value
+     */
+    public Long partitionCount() {
+        return this.partitionCount;
+    }
+
+    /**
+     * Set number of partitions created for the Event Hub, allowed values are from 1 to 32 partitions.
+     *
+     * @param partitionCount the partitionCount value to set
+     * @return the EventhubInner object itself.
+     */
+    public EventhubInner withPartitionCount(Long partitionCount) {
+        this.partitionCount = partitionCount;
+        return this;
+    }
+
+    /**
+     * Get enumerates the possible values for the status of the Event Hub. Possible values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     *
+     * @return the status value
+     */
+    public EntityStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Set enumerates the possible values for the status of the Event Hub. Possible values include: 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown'.
+     *
+     * @param status the status value to set
+     * @return the EventhubInner object itself.
+     */
+    public EventhubInner withStatus(EntityStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get properties of capture description.
+     *
+     * @return the captureDescription value
+     */
+    public CaptureDescription captureDescription() {
+        return this.captureDescription;
+    }
+
+    /**
+     * Set properties of capture description.
+     *
+     * @param captureDescription the captureDescription value to set
+     * @return the EventhubInner object itself.
+     */
+    public EventhubInner withCaptureDescription(CaptureDescription captureDescription) {
+        this.captureDescription = captureDescription;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubNamespaceAuthorizationRuleImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubNamespaceAuthorizationRuleImpl.java
new file mode 100644
index 000000000000..45c3cb68433b
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/EventhubNamespaceAuthorizationRuleImpl.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.EventhubNamespaceAuthorizationRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessRights;
+
+class EventhubNamespaceAuthorizationRuleImpl extends CreatableUpdatableImpl<EventhubNamespaceAuthorizationRule, AuthorizationRuleInner, EventhubNamespaceAuthorizationRuleImpl> implements EventhubNamespaceAuthorizationRule, EventhubNamespaceAuthorizationRule.Definition, EventhubNamespaceAuthorizationRule.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String eventHubName;
+    private String authorizationRuleName;
+    private List<AccessRights> crights;
+    private List<AccessRights> urights;
+
+    EventhubNamespaceAuthorizationRuleImpl(String name, EventHubManager manager) {
+        super(name, new AuthorizationRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = name;
+        //
+    }
+
+    EventhubNamespaceAuthorizationRuleImpl(AuthorizationRuleInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.eventHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "eventhubs");
+        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "authorizationRules");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<EventhubNamespaceAuthorizationRule> createResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.authorizationRuleName, this.crights)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<EventhubNamespaceAuthorizationRule> updateResourceAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.authorizationRuleName, this.urights)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<AuthorizationRuleInner> getInnerAsync() {
+        EventHubsInner client = this.manager().inner().eventHubs();
+        return client.getAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.eventHubName, this.authorizationRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<AccessRights> rights() {
+        return this.inner().rights();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public EventhubNamespaceAuthorizationRuleImpl withExistingEventhub(String resourceGroupName, String namespaceName, String eventHubName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        this.eventHubName = eventHubName;
+        return this;
+    }
+
+    @Override
+    public EventhubNamespaceAuthorizationRuleImpl withRights(List<AccessRights> rights) {
+        if (isInCreateMode()) {
+            this.crights = rights;
+        } else {
+            this.urights = rights;
+        }
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/IdParsingUtils.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..d9357d9b04de
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/IdParsingUtils.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+import java.util.Arrays;
+import java.util.Iterator;
+
+class IdParsingUtils {
+    public static String getValueFromIdByName(String id, String name) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator<String> itr = iterable.iterator();
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (part.equalsIgnoreCase(name)) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getValueFromIdByPosition(String id, int pos) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator <String> itr = iterable.iterator();
+        int index = 0;
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (index == pos) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+            index++;
+        }
+        return null;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingPlanImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingPlanImpl.java
new file mode 100644
index 000000000000..f79f597ae112
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingPlanImpl.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingPlan;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.Map;
+import org.joda.time.DateTime;
+
+class MessagingPlanImpl extends WrapperImpl<MessagingPlanInner> implements MessagingPlan {
+    private final EventHubManager manager;
+    MessagingPlanImpl(MessagingPlanInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Long revision() {
+        return this.inner().revision();
+    }
+
+    @Override
+    public Integer selectedEventHubUnit() {
+        return this.inner().selectedEventHubUnit();
+    }
+
+    @Override
+    public Integer sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingPlanInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingPlanInner.java
new file mode 100644
index 000000000000..5cf587e63f77
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingPlanInner.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Messaging Plan for the namespace.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class MessagingPlanInner extends Resource {
+    /**
+     * Sku type.
+     */
+    @JsonProperty(value = "properties.sku", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer sku;
+
+    /**
+     * Selected event hub unit.
+     */
+    @JsonProperty(value = "properties.selectedEventHubUnit", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer selectedEventHubUnit;
+
+    /**
+     * The exact time the messaging plan was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * revision number.
+     */
+    @JsonProperty(value = "properties.revision", access = JsonProperty.Access.WRITE_ONLY)
+    private Long revision;
+
+    /**
+     * Get sku type.
+     *
+     * @return the sku value
+     */
+    public Integer sku() {
+        return this.sku;
+    }
+
+    /**
+     * Get selected event hub unit.
+     *
+     * @return the selectedEventHubUnit value
+     */
+    public Integer selectedEventHubUnit() {
+        return this.selectedEventHubUnit;
+    }
+
+    /**
+     * Get the exact time the messaging plan was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get revision number.
+     *
+     * @return the revision value
+     */
+    public Long revision() {
+        return this.revision;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingRegionsImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingRegionsImpl.java
new file mode 100644
index 000000000000..c57566474f6a
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingRegionsImpl.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingRegions;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingRegionsProperties;
+import java.util.Map;
+
+class MessagingRegionsImpl extends WrapperImpl<MessagingRegionsInner> implements MessagingRegions {
+    private final EventHubManager manager;
+    MessagingRegionsImpl(MessagingRegionsInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public MessagingRegionsProperties properties() {
+        return this.inner().properties();
+    }
+
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingRegionsInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingRegionsInner.java
new file mode 100644
index 000000000000..3f7735de79b1
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/MessagingRegionsInner.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingRegionsProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Messaging Region.
+ */
+@SkipParentValidation
+public class MessagingRegionsInner extends Resource {
+    /**
+     * The properties property.
+     */
+    @JsonProperty(value = "properties")
+    private MessagingRegionsProperties properties;
+
+    /**
+     * Get the properties value.
+     *
+     * @return the properties value
+     */
+    public MessagingRegionsProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties value.
+     *
+     * @param properties the properties value to set
+     * @return the MessagingRegionsInner object itself.
+     */
+    public MessagingRegionsInner withProperties(MessagingRegionsProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespaceAuthorizationRuleImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespaceAuthorizationRuleImpl.java
new file mode 100644
index 000000000000..903832cfb35f
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespaceAuthorizationRuleImpl.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.NamespaceAuthorizationRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessRights;
+
+class NamespaceAuthorizationRuleImpl extends CreatableUpdatableImpl<NamespaceAuthorizationRule, AuthorizationRuleInner, NamespaceAuthorizationRuleImpl> implements NamespaceAuthorizationRule, NamespaceAuthorizationRule.Definition, NamespaceAuthorizationRule.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String authorizationRuleName;
+    private List<AccessRights> crights;
+    private List<AccessRights> urights;
+
+    NamespaceAuthorizationRuleImpl(String name, EventHubManager manager) {
+        super(name, new AuthorizationRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = name;
+        //
+    }
+
+    NamespaceAuthorizationRuleImpl(AuthorizationRuleInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.authorizationRuleName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "AuthorizationRules");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<NamespaceAuthorizationRule> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.authorizationRuleName, this.crights)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<NamespaceAuthorizationRule> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.authorizationRuleName, this.urights)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<AuthorizationRuleInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getAuthorizationRuleAsync(this.resourceGroupName, this.namespaceName, this.authorizationRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<AccessRights> rights() {
+        return this.inner().rights();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public NamespaceAuthorizationRuleImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+    @Override
+    public NamespaceAuthorizationRuleImpl withRights(List<AccessRights> rights) {
+        if (isInCreateMode()) {
+            this.crights = rights;
+        } else {
+            this.urights = rights;
+        }
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java
new file mode 100644
index 000000000000..37da88a50ce6
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java
@@ -0,0 +1,248 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * def
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces;
+import com.microsoft.azure.management.eventhub.v2017_04_01.EHNamespace;
+import rx.Observable;
+import rx.Completable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import com.microsoft.azure.arm.resources.ResourceUtilsCore;
+import com.microsoft.azure.arm.utils.RXMapper;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingPlan;
+import com.microsoft.azure.management.eventhub.v2017_04_01.CheckNameAvailabilityResult;
+import com.microsoft.azure.management.eventhub.v2017_04_01.NamespaceAuthorizationRule;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessKeys;
+import com.microsoft.azure.management.eventhub.v2017_04_01.RegenerateAccessKeyParameters;
+
+class NamespacesImpl extends GroupableResourcesCoreImpl<EHNamespace, EHNamespaceImpl, EHNamespaceInner, NamespacesInner, EventHubManager>  implements Namespaces {
+    protected NamespacesImpl(EventHubManager manager) {
+        super(manager.inner().namespaces(), manager);
+    }
+
+    @Override
+    protected Observable<EHNamespaceInner> getInnerAsync(String resourceGroupName, String name) {
+        NamespacesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NamespacesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(Collection<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Observable.empty();
+        }
+        Collection<Observable<String>> observables = new ArrayList<>();
+        for (String id : ids) {
+            final String resourceGroupName = ResourceUtilsCore.groupFromResourceId(id);
+            final String name = ResourceUtilsCore.nameFromResourceId(id);
+            Observable<String> o = RXMapper.map(this.inner().deleteAsync(resourceGroupName, name), id);
+            observables.add(o);
+        }
+        return Observable.mergeDelayError(observables);
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(String...ids) {
+        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public void deleteByIds(Collection<String> ids) {
+        if (ids != null && !ids.isEmpty()) {
+            this.deleteByIdsAsync(ids).toBlocking().last();
+        }
+    }
+
+    @Override
+    public void deleteByIds(String...ids) {
+        this.deleteByIds(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public PagedList<EHNamespace> listByResourceGroup(String resourceGroupName) {
+        NamespacesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<EHNamespace> listByResourceGroupAsync(String resourceGroupName) {
+        NamespacesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<EHNamespaceInner>, Iterable<EHNamespaceInner>>() {
+            @Override
+            public Iterable<EHNamespaceInner> call(Page<EHNamespaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EHNamespaceInner, EHNamespace>() {
+            @Override
+            public EHNamespace call(EHNamespaceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<EHNamespace> list() {
+        NamespacesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<EHNamespace> listAsync() {
+        NamespacesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<EHNamespaceInner>, Iterable<EHNamespaceInner>>() {
+            @Override
+            public Iterable<EHNamespaceInner> call(Page<EHNamespaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EHNamespaceInner, EHNamespace>() {
+            @Override
+            public EHNamespace call(EHNamespaceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public EHNamespaceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<MessagingPlan> getMessagingPlanAsync(String resourceGroupName, String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.getMessagingPlanAsync(resourceGroupName, namespaceName)
+        .map(new Func1<MessagingPlanInner, MessagingPlan>() {
+            @Override
+            public MessagingPlan call(MessagingPlanInner inner) {
+                return new MessagingPlanImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String name) {
+        NamespacesInner client = this.inner();
+        return client.checkNameAvailabilityAsync(name)
+        .map(new Func1<CheckNameAvailabilityResultInner, CheckNameAvailabilityResult>() {
+            @Override
+            public CheckNameAvailabilityResult call(CheckNameAvailabilityResultInner inner) {
+                return new CheckNameAvailabilityResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected EHNamespaceImpl wrapModel(EHNamespaceInner inner) {
+        return  new EHNamespaceImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected EHNamespaceImpl wrapModel(String name) {
+        return new EHNamespaceImpl(name, new EHNamespaceInner(), this.manager());
+    }
+
+    @Override
+    public NamespaceAuthorizationRuleImpl defineAuthorizationRule(String name) {
+        return wrapAuthorizationRuleModel(name);
+    }
+
+    private NamespaceAuthorizationRuleImpl wrapAuthorizationRuleModel(String name) {
+        return new NamespaceAuthorizationRuleImpl(name, this.manager());
+    }
+
+    private NamespaceAuthorizationRuleImpl wrapNamespaceAuthorizationRuleModel(AuthorizationRuleInner inner) {
+        return  new NamespaceAuthorizationRuleImpl(inner, manager());
+    }
+
+    private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingNamespacesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "AuthorizationRules");
+        NamespacesInner client = this.inner();
+        return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName);
+    }
+
+    @Override
+    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>() {
+            @Override
+            public NamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
+                return wrapNamespaceAuthorizationRuleModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<NamespaceAuthorizationRule> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.listAuthorizationRulesAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<AuthorizationRuleInner>, Iterable<AuthorizationRuleInner>>() {
+            @Override
+            public Iterable<AuthorizationRuleInner> call(Page<AuthorizationRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AuthorizationRuleInner, NamespaceAuthorizationRule>() {
+            @Override
+            public NamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
+                return wrapNamespaceAuthorizationRuleModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        NamespacesInner client = this.inner();
+        return client.deleteAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName).toCompletable();
+    }
+
+    @Override
+    public Observable<AccessKeys> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        NamespacesInner client = this.inner();
+        return client.listKeysAsync(resourceGroupName, namespaceName, authorizationRuleName)
+        .map(new Func1<AccessKeysInner, AccessKeys>() {
+            @Override
+            public AccessKeys call(AccessKeysInner inner) {
+                return new AccessKeysImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        NamespacesInner client = this.inner();
+        return client.regenerateKeysAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters)
+        .map(new Func1<AccessKeysInner, AccessKeys>() {
+            @Override
+            public AccessKeys call(AccessKeysInner inner) {
+                return new AccessKeysImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java
new file mode 100644
index 000000000000..26c89ff1d99d
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java
@@ -0,0 +1,1989 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2017_04_01.AccessRights;
+import com.microsoft.azure.management.eventhub.v2017_04_01.CheckNameAvailabilityParameter;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ErrorResponseException;
+import com.microsoft.azure.management.eventhub.v2017_04_01.RegenerateAccessKeyParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Namespaces.
+ */
+public class NamespacesInner implements InnerSupportsGet<EHNamespaceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<EHNamespaceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NamespacesService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NamespacesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NamespacesInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(NamespacesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Namespaces to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NamespacesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces checkNameAvailability" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.EventHub/CheckNameAvailability")
+        Observable<Response<ResponseBody>> checkNameAvailability(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckNameAvailabilityParameter parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.EventHub/namespaces")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2017_04_01.Namespaces listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @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.eventhub.v2017_04_01.Namespaces createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body EHNamespaceInner parameters, @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.eventhub.v2017_04_01.Namespaces beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body EHNamespaceInner parameters, @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.eventhub.v2017_04_01.Namespaces delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@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.eventhub.v2017_04_01.Namespaces beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@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.eventhub.v2017_04_01.Namespaces getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@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.eventhub.v2017_04_01.Namespaces update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> update(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body EHNamespaceInner parameters, @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.eventhub.v2017_04_01.Namespaces getMessagingPlan" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/messagingplan")
+        Observable<Response<ResponseBody>> getMessagingPlan(@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.eventhub.v2017_04_01.Namespaces listAuthorizationRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules")
+        Observable<Response<ResponseBody>> listAuthorizationRules(@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.eventhub.v2017_04_01.Namespaces createOrUpdateAuthorizationRule" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdateAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body AuthorizationRuleInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces deleteAuthorizationRule" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.Namespaces getAuthorizationRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}")
+        Observable<Response<ResponseBody>> getAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.Namespaces listKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/listKeys")
+        Observable<Response<ResponseBody>> listKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @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.eventhub.v2017_04_01.Namespaces regenerateKeys" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/AuthorizationRules/{authorizationRuleName}/regenerateKeys")
+        Observable<Response<ResponseBody>> regenerateKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Body RegenerateAccessKeyParameters parameters, @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.eventhub.v2017_04_01.Namespaces listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@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.eventhub.v2017_04_01.Namespaces listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@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.eventhub.v2017_04_01.Namespaces listAuthorizationRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAuthorizationRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @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 CheckNameAvailabilityResultInner object if successful.
+     */
+    public CheckNameAvailabilityResultInner checkNameAvailability(String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(name).toBlocking().single().body();
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @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<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String name, final ServiceCallback<CheckNameAvailabilityResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkNameAvailabilityWithServiceResponseAsync(name), serviceCallback);
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(name).map(new Func1<ServiceResponse<CheckNameAvailabilityResultInner>, CheckNameAvailabilityResultInner>() {
+            @Override
+            public CheckNameAvailabilityResultInner call(ServiceResponse<CheckNameAvailabilityResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Check the give Namespace name availability.
+     *
+     * @param name Name to check the namespace name availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> checkNameAvailabilityWithServiceResponseAsync(String name) {
+        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.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        CheckNameAvailabilityParameter parameters = new CheckNameAvailabilityParameter();
+        parameters.withName(name);
+        return service.checkNameAvailability(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CheckNameAvailabilityResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CheckNameAvailabilityResultInner> clientResponse = checkNameAvailabilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CheckNameAvailabilityResultInner> checkNameAvailabilityDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CheckNameAvailabilityResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CheckNameAvailabilityResultInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> list() {
+        ServiceResponse<Page<EHNamespaceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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<EHNamespaceInner>> listAsync(final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listSinglePageAsync() {
+        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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<EHNamespaceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @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<EHNamespaceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+    ServiceResponse<PageImpl<EHNamespaceInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName 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.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner createOrUpdate(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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<EHNamespaceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<EHNamespaceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<EHNamespaceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner beginCreateOrUpdate(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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<EHNamespaceInner> beginCreateOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<EHNamespaceInner> beginCreateOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreateOrUpdate(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EHNamespaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EHNamespaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EHNamespaceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EHNamespaceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EHNamespaceInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(201, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public void delete(String resourceGroupName, String namespaceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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<Void> deleteAsync(String resourceGroupName, String namespaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, 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.");
+        }
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public void beginDelete(String resourceGroupName, String namespaceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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<Void> beginDeleteAsync(String resourceGroupName, String namespaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String namespaceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, 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.beginDelete(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the description of the specified 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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner getByResourceGroup(String resourceGroupName, String namespaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the description of the specified 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<EHNamespaceInner> getByResourceGroupAsync(String resourceGroupName, String namespaceName, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Gets the description of the specified 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 EHNamespaceInner object
+     */
+    public Observable<EHNamespaceInner> getByResourceGroupAsync(String resourceGroupName, String namespaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the description of the specified 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 EHNamespaceInner object
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, 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.getByResourceGroup(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EHNamespaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EHNamespaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EHNamespaceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EHNamespaceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EHNamespaceInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(201, new TypeToken<EHNamespaceInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner update(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @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<EHNamespaceInner> updateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<EHNamespaceInner> updateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> updateWithServiceResponseAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.update(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EHNamespaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EHNamespaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EHNamespaceInner> clientResponse = updateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EHNamespaceInner> updateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EHNamespaceInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(201, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets messaging plan for specified 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 MessagingPlanInner object if successful.
+     */
+    public MessagingPlanInner getMessagingPlan(String resourceGroupName, String namespaceName) {
+        return getMessagingPlanWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets messaging plan for specified 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<MessagingPlanInner> getMessagingPlanAsync(String resourceGroupName, String namespaceName, final ServiceCallback<MessagingPlanInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getMessagingPlanWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Gets messaging plan for specified 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 MessagingPlanInner object
+     */
+    public Observable<MessagingPlanInner> getMessagingPlanAsync(String resourceGroupName, String namespaceName) {
+        return getMessagingPlanWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<MessagingPlanInner>, MessagingPlanInner>() {
+            @Override
+            public MessagingPlanInner call(ServiceResponse<MessagingPlanInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets messaging plan for specified 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 MessagingPlanInner object
+     */
+    public Observable<ServiceResponse<MessagingPlanInner>> getMessagingPlanWithServiceResponseAsync(String resourceGroupName, 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.getMessagingPlan(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<MessagingPlanInner>>>() {
+                @Override
+                public Observable<ServiceResponse<MessagingPlanInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<MessagingPlanInner> clientResponse = getMessagingPlanDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<MessagingPlanInner> getMessagingPlanDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<MessagingPlanInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<MessagingPlanInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object if successful.
+     */
+    public PagedList<AuthorizationRuleInner> listAuthorizationRules(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<AuthorizationRuleInner>> response = listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<AuthorizationRuleInner>(response.body()) {
+            @Override
+            public Page<AuthorizationRuleInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of authorization rules 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<AuthorizationRuleInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<AuthorizationRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<Page<AuthorizationRuleInner>> listAuthorizationRulesAsync(final String resourceGroupName, final String namespaceName) {
+        return listAuthorizationRulesWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Page<AuthorizationRuleInner>>() {
+                @Override
+                public Page<AuthorizationRuleInner> call(ServiceResponse<Page<AuthorizationRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listAuthorizationRulesSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(ServiceResponse<Page<AuthorizationRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param resourceGroupName Name of the resource group within the azure subscription.
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AuthorizationRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesSinglePageAsync(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.listAuthorizationRules(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AuthorizationRuleInner>> result = listAuthorizationRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AuthorizationRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AuthorizationRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AuthorizationRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @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 AuthorizationRuleInner object if successful.
+     */
+    public AuthorizationRuleInner createOrUpdateAuthorizationRule(String resourceGroupName, String namespaceName, String authorizationRuleName, List<AccessRights> rights) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, rights).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @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<AuthorizationRuleInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, List<AccessRights> rights, final ServiceCallback<AuthorizationRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, rights), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<AuthorizationRuleInner> createOrUpdateAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, List<AccessRights> rights) {
+        return createOrUpdateAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, rights).map(new Func1<ServiceResponse<AuthorizationRuleInner>, AuthorizationRuleInner>() {
+            @Override
+            public AuthorizationRuleInner call(ServiceResponse<AuthorizationRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param rights The rights associated with the rule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<ServiceResponse<AuthorizationRuleInner>> createOrUpdateAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, List<AccessRights> rights) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.");
+        }
+        if (rights == null) {
+            throw new IllegalArgumentException("Parameter rights is required and cannot be null.");
+        }
+        Validator.validate(rights);
+        AuthorizationRuleInner parameters = new AuthorizationRuleInner();
+        parameters.withRights(rights);
+        return service.createOrUpdateAuthorizationRule(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AuthorizationRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AuthorizationRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AuthorizationRuleInner> clientResponse = createOrUpdateAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AuthorizationRuleInner> createOrUpdateAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AuthorizationRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AuthorizationRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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
+     */
+    public void deleteAuthorizationRule(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return deleteAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an AuthorizationRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.deleteAuthorizationRule(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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 AuthorizationRuleInner object if successful.
+     */
+    public AuthorizationRuleInner getAuthorizationRule(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<AuthorizationRuleInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<AuthorizationRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<AuthorizationRuleInner> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return getAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<AuthorizationRuleInner>, AuthorizationRuleInner>() {
+            @Override
+            public AuthorizationRuleInner call(ServiceResponse<AuthorizationRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an AuthorizationRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AuthorizationRuleInner object
+     */
+    public Observable<ServiceResponse<AuthorizationRuleInner>> getAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.getAuthorizationRule(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AuthorizationRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AuthorizationRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AuthorizationRuleInner> clientResponse = getAuthorizationRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AuthorizationRuleInner> getAuthorizationRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AuthorizationRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AuthorizationRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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 AccessKeysInner object if successful.
+     */
+    public AccessKeysInner listKeys(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule 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<AccessKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, final ServiceCallback<AccessKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<AccessKeysInner> listKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        return listKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName).map(new Func1<ServiceResponse<AccessKeysInner>, AccessKeysInner>() {
+            @Override
+            public AccessKeysInner call(ServiceResponse<AccessKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the primary and secondary connection strings for the Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<ServiceResponse<AccessKeysInner>> listKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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.listKeys(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AccessKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AccessKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AccessKeysInner> clientResponse = listKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AccessKeysInner> listKeysDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AccessKeysInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AccessKeysInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters required to regenerate the connection string.
+     * @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 AccessKeysInner object if successful.
+     */
+    public AccessKeysInner regenerateKeys(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters required to regenerate the connection string.
+     * @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<AccessKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters, final ServiceCallback<AccessKeysInner> serviceCallback) {
+        return ServiceFuture.fromResponse(regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters), serviceCallback);
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters required to regenerate the connection string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<AccessKeysInner> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        return regenerateKeysWithServiceResponseAsync(resourceGroupName, namespaceName, authorizationRuleName, parameters).map(new Func1<ServiceResponse<AccessKeysInner>, AccessKeysInner>() {
+            @Override
+            public AccessKeysInner call(ServiceResponse<AccessKeysInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Regenerates the primary or secondary connection strings for the specified Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param authorizationRuleName The authorization rule name.
+     * @param parameters Parameters required to regenerate the connection string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AccessKeysInner object
+     */
+    public Observable<ServiceResponse<AccessKeysInner>> regenerateKeysWithServiceResponseAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters) {
+        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 (authorizationRuleName == null) {
+            throw new IllegalArgumentException("Parameter authorizationRuleName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.regenerateKeys(resourceGroupName, namespaceName, authorizationRuleName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AccessKeysInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AccessKeysInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AccessKeysInner> clientResponse = regenerateKeysDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AccessKeysInner> regenerateKeysDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AccessKeysInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AccessKeysInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<EHNamespaceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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<EHNamespaceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<EHNamespaceInner>> serviceFuture, final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+    ServiceResponse<PageImpl<EHNamespaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<EHNamespaceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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<EHNamespaceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<EHNamespaceInner>> serviceFuture, final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+    ServiceResponse<PageImpl<EHNamespaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupNextSinglePageAsync(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.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object if successful.
+     */
+    public PagedList<AuthorizationRuleInner> listAuthorizationRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<AuthorizationRuleInner>> response = listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AuthorizationRuleInner>(response.body()) {
+            @Override
+            public Page<AuthorizationRuleInner> nextPage(String nextPageLink) {
+                return listAuthorizationRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of authorization rules 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<AuthorizationRuleInner>> listAuthorizationRulesNextAsync(final String nextPageLink, final ServiceFuture<List<AuthorizationRuleInner>> serviceFuture, final ListOperationCallback<AuthorizationRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAuthorizationRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(String nextPageLink) {
+                    return listAuthorizationRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<Page<AuthorizationRuleInner>> listAuthorizationRulesNextAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Page<AuthorizationRuleInner>>() {
+                @Override
+                public Page<AuthorizationRuleInner> call(ServiceResponse<Page<AuthorizationRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules 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;AuthorizationRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAuthorizationRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AuthorizationRuleInner>>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(ServiceResponse<Page<AuthorizationRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAuthorizationRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of authorization rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<AuthorizationRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AuthorizationRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> listAuthorizationRulesNextSinglePageAsync(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.listAuthorizationRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AuthorizationRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AuthorizationRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AuthorizationRuleInner>> result = listAuthorizationRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AuthorizationRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AuthorizationRuleInner>> listAuthorizationRulesNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AuthorizationRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AuthorizationRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationImpl.java
new file mode 100644
index 000000000000..1762c0032dd1
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.Operation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.OperationDisplay;
+
+class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
+    private final EventHubManager manager;
+    OperationImpl(OperationInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public OperationDisplay display() {
+        return this.inner().display();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationInner.java
new file mode 100644
index 000000000000..554b0b9616aa
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationInner.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.management.eventhub.v2017_04_01.OperationDisplay;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Event Hub REST API operation.
+ */
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The object that represents the operation.
+     */
+    @JsonProperty(value = "display")
+    private OperationDisplay display;
+
+    /**
+     * Get operation name: {provider}/{resource}/{operation}.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the object that represents the operation.
+     *
+     * @return the display value
+     */
+    public OperationDisplay display() {
+        return this.display;
+    }
+
+    /**
+     * Set the object that represents the operation.
+     *
+     * @param display the display value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withDisplay(OperationDisplay display) {
+        this.display = display;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationsImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationsImpl.java
new file mode 100644
index 000000000000..efd281f3ed73
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationsImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Operations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Operation;
+
+class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
+    private final EventHubManager manager;
+
+    OperationsImpl(EventHubManager manager) {
+        super(manager.inner().operations());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<Operation> listAsync() {
+        OperationsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<OperationInner>, Iterable<OperationInner>>() {
+            @Override
+            public Iterable<OperationInner> call(Page<OperationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<OperationInner, Operation>() {
+            @Override
+            public Operation call(OperationInner inner) {
+                return new OperationImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationsInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationsInner.java
new file mode 100644
index 000000000000..f0eb2f0a1ddd
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/OperationsInner.java
@@ -0,0 +1,283 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Operations.
+ */
+public class OperationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private OperationsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of OperationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public OperationsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(OperationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Operations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface OperationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Operations list" })
+        @GET("providers/Microsoft.EventHub/operations")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2017_04_01.Operations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> list() {
+        ServiceResponse<Page<OperationInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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<OperationInner>> listAsync(final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listSinglePageAsync() {
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.list(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<OperationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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<OperationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<OperationInner>> serviceFuture, final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+    ServiceResponse<PageImpl<OperationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/PageImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/PageImpl.java
new file mode 100644
index 000000000000..47b2a4e2b148
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/PageImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/RegionsImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/RegionsImpl.java
new file mode 100644
index 000000000000..02b1c94d9981
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/RegionsImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2017_04_01.Regions;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingRegions;
+
+class RegionsImpl extends WrapperImpl<RegionsInner> implements Regions {
+    private final EventHubManager manager;
+
+    RegionsImpl(EventHubManager manager) {
+        super(manager.inner().regions());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<MessagingRegions> listBySkuAsync(final String sku) {
+        RegionsInner client = this.inner();
+        return client.listBySkuAsync(sku)
+        .flatMapIterable(new Func1<Page<MessagingRegionsInner>, Iterable<MessagingRegionsInner>>() {
+            @Override
+            public Iterable<MessagingRegionsInner> call(Page<MessagingRegionsInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<MessagingRegionsInner, MessagingRegions>() {
+            @Override
+            public MessagingRegions call(MessagingRegionsInner inner) {
+                return new MessagingRegionsImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/RegionsInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/RegionsInner.java
new file mode 100644
index 000000000000..48772a36798a
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/RegionsInner.java
@@ -0,0 +1,295 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2017_04_01.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Regions.
+ */
+public class RegionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private RegionsService service;
+    /** The service client containing this operation class. */
+    private EventHubManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RegionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RegionsInner(Retrofit retrofit, EventHubManagementClientImpl client) {
+        this.service = retrofit.create(RegionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Regions to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RegionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Regions listBySku" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.EventHub/sku/{sku}/regions")
+        Observable<Response<ResponseBody>> listBySku(@Path("subscriptionId") String subscriptionId, @Path("sku") String sku, @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.eventhub.v2017_04_01.Regions listBySkuNext" })
+        @GET
+        Observable<Response<ResponseBody>> listBySkuNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @param sku The sku type.
+     * @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;MessagingRegionsInner&gt; object if successful.
+     */
+    public PagedList<MessagingRegionsInner> listBySku(final String sku) {
+        ServiceResponse<Page<MessagingRegionsInner>> response = listBySkuSinglePageAsync(sku).toBlocking().single();
+        return new PagedList<MessagingRegionsInner>(response.body()) {
+            @Override
+            public Page<MessagingRegionsInner> nextPage(String nextPageLink) {
+                return listBySkuNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @param sku The sku type.
+     * @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<MessagingRegionsInner>> listBySkuAsync(final String sku, final ListOperationCallback<MessagingRegionsInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBySkuSinglePageAsync(sku),
+            new Func1<String, Observable<ServiceResponse<Page<MessagingRegionsInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<MessagingRegionsInner>>> call(String nextPageLink) {
+                    return listBySkuNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @param sku The sku type.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;MessagingRegionsInner&gt; object
+     */
+    public Observable<Page<MessagingRegionsInner>> listBySkuAsync(final String sku) {
+        return listBySkuWithServiceResponseAsync(sku)
+            .map(new Func1<ServiceResponse<Page<MessagingRegionsInner>>, Page<MessagingRegionsInner>>() {
+                @Override
+                public Page<MessagingRegionsInner> call(ServiceResponse<Page<MessagingRegionsInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @param sku The sku type.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;MessagingRegionsInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<MessagingRegionsInner>>> listBySkuWithServiceResponseAsync(final String sku) {
+        return listBySkuSinglePageAsync(sku)
+            .concatMap(new Func1<ServiceResponse<Page<MessagingRegionsInner>>, Observable<ServiceResponse<Page<MessagingRegionsInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<MessagingRegionsInner>>> call(ServiceResponse<Page<MessagingRegionsInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBySkuNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+    ServiceResponse<PageImpl<MessagingRegionsInner>> * @param sku The sku type.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;MessagingRegionsInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<MessagingRegionsInner>>> listBySkuSinglePageAsync(final String sku) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (sku == null) {
+            throw new IllegalArgumentException("Parameter sku 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.listBySku(this.client.subscriptionId(), sku, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<MessagingRegionsInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<MessagingRegionsInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<MessagingRegionsInner>> result = listBySkuDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<MessagingRegionsInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<MessagingRegionsInner>> listBySkuDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<MessagingRegionsInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<MessagingRegionsInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @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;MessagingRegionsInner&gt; object if successful.
+     */
+    public PagedList<MessagingRegionsInner> listBySkuNext(final String nextPageLink) {
+        ServiceResponse<Page<MessagingRegionsInner>> response = listBySkuNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<MessagingRegionsInner>(response.body()) {
+            @Override
+            public Page<MessagingRegionsInner> nextPage(String nextPageLink) {
+                return listBySkuNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @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<MessagingRegionsInner>> listBySkuNextAsync(final String nextPageLink, final ServiceFuture<List<MessagingRegionsInner>> serviceFuture, final ListOperationCallback<MessagingRegionsInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBySkuNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<MessagingRegionsInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<MessagingRegionsInner>>> call(String nextPageLink) {
+                    return listBySkuNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @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;MessagingRegionsInner&gt; object
+     */
+    public Observable<Page<MessagingRegionsInner>> listBySkuNextAsync(final String nextPageLink) {
+        return listBySkuNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<MessagingRegionsInner>>, Page<MessagingRegionsInner>>() {
+                @Override
+                public Page<MessagingRegionsInner> call(ServiceResponse<Page<MessagingRegionsInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+     * @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;MessagingRegionsInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<MessagingRegionsInner>>> listBySkuNextWithServiceResponseAsync(final String nextPageLink) {
+        return listBySkuNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<MessagingRegionsInner>>, Observable<ServiceResponse<Page<MessagingRegionsInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<MessagingRegionsInner>>> call(ServiceResponse<Page<MessagingRegionsInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBySkuNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the available Regions for a given sku.
+     *
+    ServiceResponse<PageImpl<MessagingRegionsInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;MessagingRegionsInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<MessagingRegionsInner>>> listBySkuNextSinglePageAsync(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.listBySkuNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<MessagingRegionsInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<MessagingRegionsInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<MessagingRegionsInner>> result = listBySkuNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<MessagingRegionsInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<MessagingRegionsInner>> listBySkuNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<MessagingRegionsInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<MessagingRegionsInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/package-info.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/package-info.java
new file mode 100644
index 000000000000..33d80ee0552f
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the implementation classes for EventHubManagementClient.
+ * Azure Event Hubs client.
+ */
+package com.microsoft.azure.management.eventhub.v2017_04_01.implementation;
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/package-info.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/package-info.java
new file mode 100644
index 000000000000..8fee8cff612d
--- /dev/null
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the classes for EventHubManagementClient.
+ * Azure Event Hubs client.
+ */
+package com.microsoft.azure.management.eventhub.v2017_04_01;
diff --git a/eventhub/resource-manager/v2018_01_01_preview/pom.xml b/eventhub/resource-manager/v2018_01_01_preview/pom.xml
new file mode 100644
index 000000000000..76c9478ad8cf
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/pom.xml
@@ -0,0 +1,133 @@
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.eventhub.v2018_01_01_preview</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-eventhub</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for EventHub Management</name>
+    <description>This package contains Microsoft EventHub Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Cluster.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Cluster.java
new file mode 100644
index 000000000000..ceddb01b6d13
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Cluster.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
+import com.microsoft.azure.arm.resources.models.HasResourceGroup;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.ClusterInner;
+
+/**
+ * Type representing Cluster.
+ */
+public interface Cluster extends HasInner<ClusterInner>, Resource, GroupableResourceCore<EventHubManager, ClusterInner>, HasResourceGroup, Refreshable<Cluster>, Updatable<Cluster.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the created value.
+     */
+    String created();
+
+    /**
+     * @return the metricId value.
+     */
+    String metricId();
+
+    /**
+     * @return the sku value.
+     */
+    ClusterSku sku();
+
+    /**
+     * @return the updated value.
+     */
+    String updated();
+
+    /**
+     * The template for a Cluster update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<Cluster>, Resource.UpdateWithTags<Update>, UpdateStages.WithSku {
+    }
+
+    /**
+     * Grouping of Cluster update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the cluster {0} allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            Update withSku(ClusterSku sku);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ClusterQuotaConfigurationProperties.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ClusterQuotaConfigurationProperties.java
new file mode 100644
index 000000000000..c2e7fccab01a
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ClusterQuotaConfigurationProperties.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.ClusterQuotaConfigurationPropertiesInner;
+import java.util.Map;
+
+/**
+ * Type representing ClusterQuotaConfigurationProperties.
+ */
+public interface ClusterQuotaConfigurationProperties extends HasInner<ClusterQuotaConfigurationPropertiesInner>, HasManager<EventHubManager> {
+    /**
+     * @return the settings value.
+     */
+    Map<String, String> settings();
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ClusterSku.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ClusterSku.java
new file mode 100644
index 000000000000..2dcae128cd47
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ClusterSku.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU parameters particular to a cluster instance.
+ */
+public class ClusterSku {
+    /**
+     * Name of this SKU.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * The quantity of Event Hubs Cluster Capacity Units contained in this
+     * cluster.
+     */
+    @JsonProperty(value = "capacity")
+    private Integer capacity;
+
+    /**
+     * Creates an instance of ClusterSku class.
+     */
+    public ClusterSku() {
+        name = "Dedicated";
+    }
+
+    /**
+     * Get name of this SKU.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of this SKU.
+     *
+     * @param name the name value to set
+     * @return the ClusterSku object itself.
+     */
+    public ClusterSku withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the quantity of Event Hubs Cluster Capacity Units contained in this cluster.
+     *
+     * @return the capacity value
+     */
+    public Integer capacity() {
+        return this.capacity;
+    }
+
+    /**
+     * Set the quantity of Event Hubs Cluster Capacity Units contained in this cluster.
+     *
+     * @param capacity the capacity value to set
+     * @return the ClusterSku object itself.
+     */
+    public ClusterSku withCapacity(Integer capacity) {
+        this.capacity = capacity;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Clusters.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Clusters.java
new file mode 100644
index 000000000000..4172477cb014
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Clusters.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
+import rx.Observable;
+import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.ClustersInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Clusters.
+ */
+public interface Clusters extends SupportsGettingByResourceGroup<Cluster>, SupportsListingByResourceGroup<Cluster>, HasInner<ClustersInner> {
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Configurations.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Configurations.java
new file mode 100644
index 000000000000..c56be5c06afa
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Configurations.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.ConfigurationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Configurations.
+ */
+public interface Configurations extends HasInner<ConfigurationsInner> {
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ClusterQuotaConfigurationProperties> patchAsync(String resourceGroupName, String clusterName);
+
+    /**
+     * Get all Event Hubs Cluster settings - a collection of key/value pairs which represent the quotas and settings imposed on the cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ClusterQuotaConfigurationProperties> getAsync(String resourceGroupName, String clusterName);
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/DefaultAction.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/DefaultAction.java
new file mode 100644
index 000000000000..442aea8a23e9
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/DefaultAction.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DefaultAction.
+ */
+public final class DefaultAction extends ExpandableStringEnum<DefaultAction> {
+    /** Static value Allow for DefaultAction. */
+    public static final DefaultAction ALLOW = fromString("Allow");
+
+    /** Static value Deny for DefaultAction. */
+    public static final DefaultAction DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a DefaultAction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DefaultAction
+     */
+    @JsonCreator
+    public static DefaultAction fromString(String name) {
+        return fromString(name, DefaultAction.class);
+    }
+
+    /**
+     * @return known DefaultAction values
+     */
+    public static Collection<DefaultAction> values() {
+        return values(DefaultAction.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/EHNamespace.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/EHNamespace.java
new file mode 100644
index 000000000000..51f2e3da2fd5
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/EHNamespace.java
@@ -0,0 +1,219 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
+import com.microsoft.azure.arm.resources.models.HasResourceGroup;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+import org.joda.time.DateTime;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EHNamespaceInner;
+
+/**
+ * Type representing EHNamespace.
+ */
+public interface EHNamespace extends HasInner<EHNamespaceInner>, Resource, GroupableResourceCore<EventHubManager, EHNamespaceInner>, HasResourceGroup, Refreshable<EHNamespace>, Updatable<EHNamespace.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the createdAt value.
+     */
+    DateTime createdAt();
+
+    /**
+     * @return the isAutoInflateEnabled value.
+     */
+    Boolean isAutoInflateEnabled();
+
+    /**
+     * @return the kafkaEnabled value.
+     */
+    Boolean kafkaEnabled();
+
+    /**
+     * @return the maximumThroughputUnits value.
+     */
+    Integer maximumThroughputUnits();
+
+    /**
+     * @return the metricId value.
+     */
+    String metricId();
+
+    /**
+     * @return the provisioningState value.
+     */
+    String provisioningState();
+
+    /**
+     * @return the serviceBusEndpoint value.
+     */
+    String serviceBusEndpoint();
+
+    /**
+     * @return the sku value.
+     */
+    Sku sku();
+
+    /**
+     * @return the updatedAt value.
+     */
+    DateTime updatedAt();
+
+    /**
+     * @return the zoneRedundant value.
+     */
+    Boolean zoneRedundant();
+
+    /**
+     * The entirety of the EHNamespace definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of EHNamespace definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a EHNamespace definition.
+         */
+        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        }
+
+        /**
+         * The stage of the EHNamespace definition allowing to specify the resource group.
+         */
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify IsAutoInflateEnabled.
+         */
+        interface WithIsAutoInflateEnabled {
+            /**
+             * Specifies isAutoInflateEnabled.
+             */
+            WithCreate withIsAutoInflateEnabled(Boolean isAutoInflateEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify KafkaEnabled.
+         */
+        interface WithKafkaEnabled {
+            /**
+             * Specifies kafkaEnabled.
+             */
+            WithCreate withKafkaEnabled(Boolean kafkaEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify MaximumThroughputUnits.
+         */
+        interface WithMaximumThroughputUnits {
+            /**
+             * Specifies maximumThroughputUnits.
+             */
+            WithCreate withMaximumThroughputUnits(Integer maximumThroughputUnits);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            WithCreate withSku(Sku sku);
+        }
+
+        /**
+         * The stage of the ehnamespace update allowing to specify ZoneRedundant.
+         */
+        interface WithZoneRedundant {
+            /**
+             * Specifies zoneRedundant.
+             */
+            WithCreate withZoneRedundant(Boolean zoneRedundant);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<EHNamespace>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithIsAutoInflateEnabled, DefinitionStages.WithKafkaEnabled, DefinitionStages.WithMaximumThroughputUnits, DefinitionStages.WithSku, DefinitionStages.WithZoneRedundant {
+        }
+    }
+    /**
+     * The template for a EHNamespace update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<EHNamespace>, Resource.UpdateWithTags<Update>, UpdateStages.WithIsAutoInflateEnabled, UpdateStages.WithKafkaEnabled, UpdateStages.WithMaximumThroughputUnits, UpdateStages.WithSku, UpdateStages.WithZoneRedundant {
+    }
+
+    /**
+     * Grouping of EHNamespace update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ehnamespace {0} allowing to specify IsAutoInflateEnabled.
+         */
+        interface WithIsAutoInflateEnabled {
+            /**
+             * Specifies isAutoInflateEnabled.
+             */
+            Update withIsAutoInflateEnabled(Boolean isAutoInflateEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify KafkaEnabled.
+         */
+        interface WithKafkaEnabled {
+            /**
+             * Specifies kafkaEnabled.
+             */
+            Update withKafkaEnabled(Boolean kafkaEnabled);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify MaximumThroughputUnits.
+         */
+        interface WithMaximumThroughputUnits {
+            /**
+             * Specifies maximumThroughputUnits.
+             */
+            Update withMaximumThroughputUnits(Integer maximumThroughputUnits);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            Update withSku(Sku sku);
+        }
+
+        /**
+         * The stage of the ehnamespace {0} allowing to specify ZoneRedundant.
+         */
+        interface WithZoneRedundant {
+            /**
+             * Specifies zoneRedundant.
+             */
+            Update withZoneRedundant(Boolean zoneRedundant);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ErrorResponse.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ErrorResponse.java
new file mode 100644
index 000000000000..db20378ce1ff
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ErrorResponse.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Error response that indicates the service is not able to process the
+ * incoming request. The reason is provided in the error message.
+ */
+public class ErrorResponse {
+    /**
+     * Error code.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Error message indicating why the operation failed.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Get error code.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set error code.
+     *
+     * @param code the code value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get error message indicating why the operation failed.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set error message indicating why the operation failed.
+     *
+     * @param message the message value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ErrorResponseException.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ErrorResponseException.java
new file mode 100644
index 000000000000..c9febdf3696c
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/ErrorResponseException.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.rest.RestException;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with ErrorResponse information.
+ */
+public class ErrorResponseException extends RestException {
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     * @param body the deserialized response body
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response, final ErrorResponse body) {
+        super(message, response, body);
+    }
+
+    @Override
+    public ErrorResponse body() {
+        return (ErrorResponse) super.body();
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/IPAction.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/IPAction.java
new file mode 100644
index 000000000000..5800d42465f9
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/IPAction.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IPAction.
+ */
+public final class IPAction extends ExpandableStringEnum<IPAction> {
+    /** Static value Accept for IPAction. */
+    public static final IPAction ACCEPT = fromString("Accept");
+
+    /** Static value Reject for IPAction. */
+    public static final IPAction REJECT = fromString("Reject");
+
+    /**
+     * Creates or finds a IPAction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding IPAction
+     */
+    @JsonCreator
+    public static IPAction fromString(String name) {
+        return fromString(name, IPAction.class);
+    }
+
+    /**
+     * @return known IPAction values
+     */
+    public static Collection<IPAction> values() {
+        return values(IPAction.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/IpFilterRule.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/IpFilterRule.java
new file mode 100644
index 000000000000..ecaeb268a1e0
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/IpFilterRule.java
@@ -0,0 +1,160 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.IpFilterRuleInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+
+/**
+ * Type representing IpFilterRule.
+ */
+public interface IpFilterRule extends HasInner<IpFilterRuleInner>, Indexable, Refreshable<IpFilterRule>, Updatable<IpFilterRule.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the action value.
+     */
+    IPAction action();
+
+    /**
+     * @return the filterName value.
+     */
+    String filterName();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipMask value.
+     */
+    String ipMask();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the IpFilterRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of IpFilterRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a IpFilterRule definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the ipfilterrule definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithCreate withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the ipfilterrule definition allowing to specify Action.
+         */
+        interface WithAction {
+            /**
+             * Specifies action.
+             */
+            WithCreate withAction(IPAction action);
+        }
+
+        /**
+         * The stage of the ipfilterrule definition allowing to specify FilterName.
+         */
+        interface WithFilterName {
+            /**
+             * Specifies filterName.
+             */
+            WithCreate withFilterName(String filterName);
+        }
+
+        /**
+         * The stage of the ipfilterrule definition allowing to specify IpMask.
+         */
+        interface WithIpMask {
+            /**
+             * Specifies ipMask.
+             */
+            WithCreate withIpMask(String ipMask);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<IpFilterRule>, DefinitionStages.WithAction, DefinitionStages.WithFilterName, DefinitionStages.WithIpMask {
+        }
+    }
+    /**
+     * The template for a IpFilterRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<IpFilterRule>, UpdateStages.WithAction, UpdateStages.WithFilterName, UpdateStages.WithIpMask {
+    }
+
+    /**
+     * Grouping of IpFilterRule update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ipfilterrule update allowing to specify Action.
+         */
+        interface WithAction {
+            /**
+             * Specifies action.
+             */
+            Update withAction(IPAction action);
+        }
+
+        /**
+         * The stage of the ipfilterrule update allowing to specify FilterName.
+         */
+        interface WithFilterName {
+            /**
+             * Specifies filterName.
+             */
+            Update withFilterName(String filterName);
+        }
+
+        /**
+         * The stage of the ipfilterrule update allowing to specify IpMask.
+         */
+        interface WithIpMask {
+            /**
+             * Specifies ipMask.
+             */
+            Update withIpMask(String ipMask);
+        }
+
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NWRuleSetIpRules.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NWRuleSetIpRules.java
new file mode 100644
index 000000000000..df670d2e1c0d
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NWRuleSetIpRules.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The response from the List namespace operation.
+ */
+public class NWRuleSetIpRules {
+    /**
+     * IP Mask.
+     */
+    @JsonProperty(value = "ipMask")
+    private String ipMask;
+
+    /**
+     * The IP Filter Action. Possible values include: 'Allow'.
+     */
+    @JsonProperty(value = "action")
+    private NetworkRuleIPAction action;
+
+    /**
+     * Get iP Mask.
+     *
+     * @return the ipMask value
+     */
+    public String ipMask() {
+        return this.ipMask;
+    }
+
+    /**
+     * Set iP Mask.
+     *
+     * @param ipMask the ipMask value to set
+     * @return the NWRuleSetIpRules object itself.
+     */
+    public NWRuleSetIpRules withIpMask(String ipMask) {
+        this.ipMask = ipMask;
+        return this;
+    }
+
+    /**
+     * Get the IP Filter Action. Possible values include: 'Allow'.
+     *
+     * @return the action value
+     */
+    public NetworkRuleIPAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the IP Filter Action. Possible values include: 'Allow'.
+     *
+     * @param action the action value to set
+     * @return the NWRuleSetIpRules object itself.
+     */
+    public NWRuleSetIpRules withAction(NetworkRuleIPAction action) {
+        this.action = action;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NWRuleSetVirtualNetworkRules.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NWRuleSetVirtualNetworkRules.java
new file mode 100644
index 000000000000..e549780547d4
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NWRuleSetVirtualNetworkRules.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The response from the List namespace operation.
+ */
+public class NWRuleSetVirtualNetworkRules {
+    /**
+     * Subnet properties.
+     */
+    @JsonProperty(value = "subnet")
+    private Subnet subnet;
+
+    /**
+     * Value that indicates whether to ignore missing Vnet Service Endpoint.
+     */
+    @JsonProperty(value = "ignoreMissingVnetServiceEndpoint")
+    private Boolean ignoreMissingVnetServiceEndpoint;
+
+    /**
+     * Get subnet properties.
+     *
+     * @return the subnet value
+     */
+    public Subnet subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set subnet properties.
+     *
+     * @param subnet the subnet value to set
+     * @return the NWRuleSetVirtualNetworkRules object itself.
+     */
+    public NWRuleSetVirtualNetworkRules withSubnet(Subnet subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get value that indicates whether to ignore missing Vnet Service Endpoint.
+     *
+     * @return the ignoreMissingVnetServiceEndpoint value
+     */
+    public Boolean ignoreMissingVnetServiceEndpoint() {
+        return this.ignoreMissingVnetServiceEndpoint;
+    }
+
+    /**
+     * Set value that indicates whether to ignore missing Vnet Service Endpoint.
+     *
+     * @param ignoreMissingVnetServiceEndpoint the ignoreMissingVnetServiceEndpoint value to set
+     * @return the NWRuleSetVirtualNetworkRules object itself.
+     */
+    public NWRuleSetVirtualNetworkRules withIgnoreMissingVnetServiceEndpoint(Boolean ignoreMissingVnetServiceEndpoint) {
+        this.ignoreMissingVnetServiceEndpoint = ignoreMissingVnetServiceEndpoint;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Namespaces.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Namespaces.java
new file mode 100644
index 000000000000..5cd16f9d63fd
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Namespaces.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import com.microsoft.azure.arm.resources.collection.SupportsDeletingByResourceGroup;
+import com.microsoft.azure.arm.resources.collection.SupportsBatchDeletion;
+import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
+import rx.Observable;
+import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.NamespacesInner;
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.IpFilterRule;
+import rx.Completable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.VirtualNetworkRule;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.NetworkRuleSetInner;
+
+/**
+ * Type representing Namespaces.
+ */
+public interface Namespaces extends SupportsCreating<EHNamespace.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<EHNamespace>, SupportsListingByResourceGroup<EHNamespace>, SupportsListing<EHNamespace>, HasInner<NamespacesInner> {
+    /**
+     * Begins definition for a new Ipfilterrule resource.
+     * @param name resource name.
+     * @return the first stage of the new Ipfilterrule definition.
+     */
+    IpFilterRule.DefinitionStages.Blank defineIpfilterrule(String name);
+
+    /**
+     * Begins definition for a new Virtualnetworkrule resource.
+     * @param name resource name.
+     * @return the first stage of the new Virtualnetworkrule definition.
+     */
+    VirtualNetworkRule.DefinitionStages.Blank defineVirtualnetworkrule(String name);
+
+    /**
+     * Gets an IpFilterRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<IpFilterRule> getIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName);
+
+    /**
+     * Gets a list of IP Filter rules 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<IpFilterRule> listIPFilterRulesAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName);
+
+    /**
+     * Gets an VirtualNetworkRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualNetworkRule> getVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName);
+
+    /**
+     * Gets a list of VirtualNetwork rules 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<VirtualNetworkRule> listVirtualNetworkRulesAsync(final String resourceGroupName, final String namespaceName);
+
+    /**
+     * Deletes an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName);
+
+    /**
+     * Create or update NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters The Namespace IpFilterRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters);
+
+    /**
+     * Gets 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> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName);
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleIPAction.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleIPAction.java
new file mode 100644
index 000000000000..007eccc43f24
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleIPAction.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for NetworkRuleIPAction.
+ */
+public final class NetworkRuleIPAction extends ExpandableStringEnum<NetworkRuleIPAction> {
+    /** Static value Allow for NetworkRuleIPAction. */
+    public static final NetworkRuleIPAction ALLOW = fromString("Allow");
+
+    /**
+     * Creates or finds a NetworkRuleIPAction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding NetworkRuleIPAction
+     */
+    @JsonCreator
+    public static NetworkRuleIPAction fromString(String name) {
+        return fromString(name, NetworkRuleIPAction.class);
+    }
+
+    /**
+     * @return known NetworkRuleIPAction values
+     */
+    public static Collection<NetworkRuleIPAction> values() {
+        return values(NetworkRuleIPAction.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleSet.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleSet.java
new file mode 100644
index 000000000000..2c0d133892d5
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleSet.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.NetworkRuleSetInner;
+import java.util.List;
+
+/**
+ * Type representing NetworkRuleSet.
+ */
+public interface NetworkRuleSet extends HasInner<NetworkRuleSetInner>, HasManager<EventHubManager> {
+    /**
+     * @return the defaultAction value.
+     */
+    DefaultAction defaultAction();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipRules value.
+     */
+    List<NWRuleSetIpRules> ipRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the virtualNetworkRules value.
+     */
+    List<NWRuleSetVirtualNetworkRules> virtualNetworkRules();
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleSets.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleSets.java
new file mode 100644
index 000000000000..d9d379f06308
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/NetworkRuleSets.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.NetworkRuleSetsInner;
+import java.util.List;
+
+/**
+ * Type representing NetworkRuleSets.
+ */
+public interface NetworkRuleSets extends HasInner<NetworkRuleSetsInner>, HasManager<EventHubManager> {
+    /**
+     * @return the defaultAction value.
+     */
+    DefaultAction defaultAction();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the ipRules value.
+     */
+    List<NWRuleSetIpRules> ipRules();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the virtualNetworkRules value.
+     */
+    List<NWRuleSetVirtualNetworkRules> virtualNetworkRules();
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Operation.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Operation.java
new file mode 100644
index 000000000000..2aa44ca2a777
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Operation.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.OperationInner;
+
+/**
+ * Type representing Operation.
+ */
+public interface Operation extends HasInner<OperationInner>, HasManager<EventHubManager> {
+    /**
+     * @return the display value.
+     */
+    OperationDisplay display();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/OperationDisplay.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/OperationDisplay.java
new file mode 100644
index 000000000000..402a7b429643
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/OperationDisplay.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The object that represents the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft.EventHub.
+     */
+    @JsonProperty(value = "provider", access = JsonProperty.Access.WRITE_ONLY)
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed: Invoice, etc.
+     */
+    @JsonProperty(value = "resource", access = JsonProperty.Access.WRITE_ONLY)
+    private String resource;
+
+    /**
+     * Operation type: Read, write, delete, etc.
+     */
+    @JsonProperty(value = "operation", access = JsonProperty.Access.WRITE_ONLY)
+    private String operation;
+
+    /**
+     * Get service provider: Microsoft.EventHub.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Get resource on which the operation is performed: Invoice, etc.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Get operation type: Read, write, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Operations.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Operations.java
new file mode 100644
index 000000000000..3c8e45311e03
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Operations.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.OperationsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing Operations.
+ */
+public interface Operations extends HasInner<OperationsInner> {
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<Operation> listAsync();
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Sku.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Sku.java
new file mode 100644
index 000000000000..4d782dd05d85
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Sku.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SKU parameters supplied to the create namespace operation.
+ */
+public class Sku {
+    /**
+     * Name of this SKU. Possible values include: 'Basic', 'Standard'.
+     */
+    @JsonProperty(value = "name", required = true)
+    private SkuName name;
+
+    /**
+     * The billing tier of this particular SKU. Possible values include:
+     * 'Basic', 'Standard'.
+     */
+    @JsonProperty(value = "tier")
+    private SkuTier tier;
+
+    /**
+     * The Event Hubs throughput units, value should be 0 to 20 throughput
+     * units.
+     */
+    @JsonProperty(value = "capacity")
+    private Integer capacity;
+
+    /**
+     * Get name of this SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the name value
+     */
+    public SkuName name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of this SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param name the name value to set
+     * @return the Sku object itself.
+     */
+    public Sku withName(SkuName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the billing tier of this particular SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @return the tier value
+     */
+    public SkuTier tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set the billing tier of this particular SKU. Possible values include: 'Basic', 'Standard'.
+     *
+     * @param tier the tier value to set
+     * @return the Sku object itself.
+     */
+    public Sku withTier(SkuTier tier) {
+        this.tier = tier;
+        return this;
+    }
+
+    /**
+     * Get the Event Hubs throughput units, value should be 0 to 20 throughput units.
+     *
+     * @return the capacity value
+     */
+    public Integer capacity() {
+        return this.capacity;
+    }
+
+    /**
+     * Set the Event Hubs throughput units, value should be 0 to 20 throughput units.
+     *
+     * @param capacity the capacity value to set
+     * @return the Sku object itself.
+     */
+    public Sku withCapacity(Integer capacity) {
+        this.capacity = capacity;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/SkuName.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/SkuName.java
new file mode 100644
index 000000000000..9b9861a37136
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/SkuName.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SkuName.
+ */
+public final class SkuName extends ExpandableStringEnum<SkuName> {
+    /** Static value Basic for SkuName. */
+    public static final SkuName BASIC = fromString("Basic");
+
+    /** Static value Standard for SkuName. */
+    public static final SkuName STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a SkuName from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SkuName
+     */
+    @JsonCreator
+    public static SkuName fromString(String name) {
+        return fromString(name, SkuName.class);
+    }
+
+    /**
+     * @return known SkuName values
+     */
+    public static Collection<SkuName> values() {
+        return values(SkuName.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/SkuTier.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/SkuTier.java
new file mode 100644
index 000000000000..c29be1619bf0
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/SkuTier.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for SkuTier.
+ */
+public final class SkuTier extends ExpandableStringEnum<SkuTier> {
+    /** Static value Basic for SkuTier. */
+    public static final SkuTier BASIC = fromString("Basic");
+
+    /** Static value Standard for SkuTier. */
+    public static final SkuTier STANDARD = fromString("Standard");
+
+    /**
+     * Creates or finds a SkuTier from its string representation.
+     * @param name a name to look for
+     * @return the corresponding SkuTier
+     */
+    @JsonCreator
+    public static SkuTier fromString(String name) {
+        return fromString(name, SkuTier.class);
+    }
+
+    /**
+     * @return known SkuTier values
+     */
+    public static Collection<SkuTier> values() {
+        return values(SkuTier.class);
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Subnet.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Subnet.java
new file mode 100644
index 000000000000..73766a300749
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Subnet.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties supplied for Subnet.
+ */
+public class Subnet {
+    /**
+     * Resource ID of Virtual Network Subnet.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Get resource ID of Virtual Network Subnet.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID of Virtual Network Subnet.
+     *
+     * @param id the id value to set
+     * @return the Subnet object itself.
+     */
+    public Subnet withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/VirtualNetworkRule.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/VirtualNetworkRule.java
new file mode 100644
index 000000000000..4e2ae5c7673b
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/VirtualNetworkRule.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.VirtualNetworkRuleInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
+
+/**
+ * Type representing VirtualNetworkRule.
+ */
+public interface VirtualNetworkRule extends HasInner<VirtualNetworkRuleInner>, Indexable, Refreshable<VirtualNetworkRule>, Updatable<VirtualNetworkRule.Update>, HasManager<EventHubManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the virtualNetworkSubnetId value.
+     */
+    String virtualNetworkSubnetId();
+
+    /**
+     * The entirety of the VirtualNetworkRule definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNamespace, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of VirtualNetworkRule definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a VirtualNetworkRule definition.
+         */
+        interface Blank extends WithNamespace {
+        }
+
+        /**
+         * The stage of the virtualnetworkrule definition allowing to specify Namespace.
+         */
+        interface WithNamespace {
+           /**
+            * Specifies resourceGroupName, namespaceName.
+            */
+            WithCreate withExistingNamespace(String resourceGroupName, String namespaceName);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<VirtualNetworkRule> {
+        }
+    }
+    /**
+     * The template for a VirtualNetworkRule update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<VirtualNetworkRule> {
+    }
+
+    /**
+     * Grouping of VirtualNetworkRule update stages.
+     */
+    interface UpdateStages {
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterImpl.java
new file mode 100644
index 000000000000..d6631d925af2
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterImpl.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Cluster;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ClusterSku;
+
+class ClusterImpl extends GroupableResourceCoreImpl<Cluster, ClusterInner, ClusterImpl, EventHubManager> implements Cluster, Cluster.Update {
+    ClusterImpl(String name, ClusterInner inner, EventHubManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<Cluster> createResourceAsync() {
+        ClustersInner client = this.manager().inner().clusters();
+        return null; // NOP createResourceAsync implementation as create is not supported
+    }
+
+    @Override
+    public Observable<Cluster> updateResourceAsync() {
+        ClustersInner client = this.manager().inner().clusters();
+        return client.patchAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ClusterInner> getInnerAsync() {
+        ClustersInner client = this.manager().inner().clusters();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String created() {
+        return this.inner().created();
+    }
+
+    @Override
+    public String metricId() {
+        return this.inner().metricId();
+    }
+
+    @Override
+    public ClusterSku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public String updated() {
+        return this.inner().updated();
+    }
+
+    @Override
+    public ClusterImpl withSku(ClusterSku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterInner.java
new file mode 100644
index 000000000000..983efd5bdcc3
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterInner.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ClusterSku;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Single Event Hubs Cluster resource in List or Get operations.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class ClusterInner extends Resource {
+    /**
+     * Properties of the cluster SKU.
+     */
+    @JsonProperty(value = "sku")
+    private ClusterSku sku;
+
+    /**
+     * The UTC time when the Event Hubs Cluster was created.
+     */
+    @JsonProperty(value = "properties.created", access = JsonProperty.Access.WRITE_ONLY)
+    private String created;
+
+    /**
+     * The UTC time when the Event Hubs Cluster was last updated.
+     */
+    @JsonProperty(value = "properties.updated", access = JsonProperty.Access.WRITE_ONLY)
+    private String updated;
+
+    /**
+     * The metric ID of the cluster resource. Provided by the service and not
+     * modifiable by the user.
+     */
+    @JsonProperty(value = "properties.metricId", access = JsonProperty.Access.WRITE_ONLY)
+    private String metricId;
+
+    /**
+     * Get properties of the cluster SKU.
+     *
+     * @return the sku value
+     */
+    public ClusterSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set properties of the cluster SKU.
+     *
+     * @param sku the sku value to set
+     * @return the ClusterInner object itself.
+     */
+    public ClusterInner withSku(ClusterSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the UTC time when the Event Hubs Cluster was created.
+     *
+     * @return the created value
+     */
+    public String created() {
+        return this.created;
+    }
+
+    /**
+     * Get the UTC time when the Event Hubs Cluster was last updated.
+     *
+     * @return the updated value
+     */
+    public String updated() {
+        return this.updated;
+    }
+
+    /**
+     * Get the metric ID of the cluster resource. Provided by the service and not modifiable by the user.
+     *
+     * @return the metricId value
+     */
+    public String metricId() {
+        return this.metricId;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterQuotaConfigurationPropertiesImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterQuotaConfigurationPropertiesImpl.java
new file mode 100644
index 000000000000..21376002a5c2
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterQuotaConfigurationPropertiesImpl.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ClusterQuotaConfigurationProperties;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.Map;
+
+class ClusterQuotaConfigurationPropertiesImpl extends WrapperImpl<ClusterQuotaConfigurationPropertiesInner> implements ClusterQuotaConfigurationProperties {
+    private final EventHubManager manager;
+    ClusterQuotaConfigurationPropertiesImpl(ClusterQuotaConfigurationPropertiesInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Map<String, String> settings() {
+        return this.inner().settings();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterQuotaConfigurationPropertiesInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterQuotaConfigurationPropertiesInner.java
new file mode 100644
index 000000000000..4da31c731dd0
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClusterQuotaConfigurationPropertiesInner.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Contains all settings for the cluster.
+ */
+public class ClusterQuotaConfigurationPropertiesInner {
+    /**
+     * All possible Cluster settings - a collection of key/value paired
+     * settings which apply to quotas and configurations imposed on the
+     * cluster.
+     */
+    @JsonProperty(value = "settings")
+    private Map<String, String> settings;
+
+    /**
+     * Get all possible Cluster settings - a collection of key/value paired settings which apply to quotas and configurations imposed on the cluster.
+     *
+     * @return the settings value
+     */
+    public Map<String, String> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Set all possible Cluster settings - a collection of key/value paired settings which apply to quotas and configurations imposed on the cluster.
+     *
+     * @param settings the settings value to set
+     * @return the ClusterQuotaConfigurationPropertiesInner object itself.
+     */
+    public ClusterQuotaConfigurationPropertiesInner withSettings(Map<String, String> settings) {
+        this.settings = settings;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersImpl.java
new file mode 100644
index 000000000000..bfcf6e69edf2
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersImpl.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * def
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Clusters;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Cluster;
+import rx.Observable;
+import rx.Completable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+
+class ClustersImpl extends GroupableResourcesCoreImpl<Cluster, ClusterImpl, ClusterInner, ClustersInner, EventHubManager>  implements Clusters {
+    protected ClustersImpl(EventHubManager manager) {
+        super(manager.inner().clusters(), manager);
+    }
+
+    @Override
+    protected Observable<ClusterInner> getInnerAsync(String resourceGroupName, String name) {
+        ClustersInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        ClustersInner client = this.inner();
+        return Completable.error(new Throwable("Delete by RG not supported for this resource")); // NOP Delete by RG not supported
+    }
+
+    @Override
+    public PagedList<Cluster> listByResourceGroup(String resourceGroupName) {
+        ClustersInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<Cluster> listByResourceGroupAsync(String resourceGroupName) {
+        ClustersInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ClusterInner>, Iterable<ClusterInner>>() {
+            @Override
+            public Iterable<ClusterInner> call(Page<ClusterInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ClusterInner, Cluster>() {
+            @Override
+            public Cluster call(ClusterInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    protected ClusterImpl wrapModel(ClusterInner inner) {
+        return  new ClusterImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected ClusterImpl wrapModel(String name) {
+        return null; // Model is not creatable
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersInner.java
new file mode 100644
index 000000000000..427fff65d7fa
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersInner.java
@@ -0,0 +1,571 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Clusters.
+ */
+public class ClustersInner implements InnerSupportsGet<ClusterInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ClustersService service;
+    /** The service client containing this operation class. */
+    private EventHub2018PreviewManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ClustersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ClustersInner(Retrofit retrofit, EventHub2018PreviewManagementClientImpl client) {
+        this.service = retrofit.create(ClustersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Clusters to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ClustersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2018_01_01_preview.Clusters listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @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.eventhub.v2018_01_01_preview.Clusters getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters/{clusterName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("clusterName") String clusterName, @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.eventhub.v2018_01_01_preview.Clusters patch" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters/{clusterName}")
+        Observable<Response<ResponseBody>> patch(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("clusterName") String clusterName, @Query("api-version") String apiVersion, @Body ClusterInner parameters, @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.eventhub.v2018_01_01_preview.Clusters beginPatch" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters/{clusterName}")
+        Observable<Response<ResponseBody>> beginPatch(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("clusterName") String clusterName, @Query("api-version") String apiVersion, @Body ClusterInner parameters, @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.eventhub.v2018_01_01_preview.Clusters listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @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;ClusterInner&gt; object if successful.
+     */
+    public PagedList<ClusterInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ClusterInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ClusterInner>(response.body()) {
+            @Override
+            public Page<ClusterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @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<ClusterInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ClusterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ClusterInner&gt; object
+     */
+    public Observable<Page<ClusterInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ClusterInner>>, Page<ClusterInner>>() {
+                @Override
+                public Page<ClusterInner> call(ServiceResponse<Page<ClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ClusterInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ClusterInner>>, Observable<ServiceResponse<Page<ClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ClusterInner>>> call(ServiceResponse<Page<ClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+    ServiceResponse<PageImpl<ClusterInner>> * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ClusterInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName 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.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ClusterInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ClusterInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ClusterInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ClusterInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the resource description of the specified Event Hubs Cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @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 ClusterInner object if successful.
+     */
+    public ClusterInner getByResourceGroup(String resourceGroupName, String clusterName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, clusterName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the resource description of the specified Event Hubs Cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @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<ClusterInner> getByResourceGroupAsync(String resourceGroupName, String clusterName, final ServiceCallback<ClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, clusterName), serviceCallback);
+    }
+
+    /**
+     * Gets the resource description of the specified Event Hubs Cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterInner object
+     */
+    public Observable<ClusterInner> getByResourceGroupAsync(String resourceGroupName, String clusterName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, clusterName).map(new Func1<ServiceResponse<ClusterInner>, ClusterInner>() {
+            @Override
+            public ClusterInner call(ServiceResponse<ClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the resource description of the specified Event Hubs Cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterInner object
+     */
+    public Observable<ServiceResponse<ClusterInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String clusterName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (clusterName == null) {
+            throw new IllegalArgumentException("Parameter clusterName 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.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, clusterName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ClusterInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ClusterInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ClusterInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ClusterInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @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 ClusterInner object if successful.
+     */
+    public ClusterInner patch(String resourceGroupName, String clusterName, ClusterInner parameters) {
+        return patchWithServiceResponseAsync(resourceGroupName, clusterName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @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<ClusterInner> patchAsync(String resourceGroupName, String clusterName, ClusterInner parameters, final ServiceCallback<ClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(patchWithServiceResponseAsync(resourceGroupName, clusterName, parameters), serviceCallback);
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ClusterInner> patchAsync(String resourceGroupName, String clusterName, ClusterInner parameters) {
+        return patchWithServiceResponseAsync(resourceGroupName, clusterName, parameters).map(new Func1<ServiceResponse<ClusterInner>, ClusterInner>() {
+            @Override
+            public ClusterInner call(ServiceResponse<ClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ClusterInner>> patchWithServiceResponseAsync(String resourceGroupName, String clusterName, ClusterInner parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (clusterName == null) {
+            throw new IllegalArgumentException("Parameter clusterName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.patch(this.client.subscriptionId(), resourceGroupName, clusterName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ClusterInner>() { }.getType());
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @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 ClusterInner object if successful.
+     */
+    public ClusterInner beginPatch(String resourceGroupName, String clusterName, ClusterInner parameters) {
+        return beginPatchWithServiceResponseAsync(resourceGroupName, clusterName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @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<ClusterInner> beginPatchAsync(String resourceGroupName, String clusterName, ClusterInner parameters, final ServiceCallback<ClusterInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginPatchWithServiceResponseAsync(resourceGroupName, clusterName, parameters), serviceCallback);
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterInner object
+     */
+    public Observable<ClusterInner> beginPatchAsync(String resourceGroupName, String clusterName, ClusterInner parameters) {
+        return beginPatchWithServiceResponseAsync(resourceGroupName, clusterName, parameters).map(new Func1<ServiceResponse<ClusterInner>, ClusterInner>() {
+            @Override
+            public ClusterInner call(ServiceResponse<ClusterInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Modifies mutable properties on the Event Hubs Cluster. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param parameters The properties of the Event Hubs Cluster which should be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterInner object
+     */
+    public Observable<ServiceResponse<ClusterInner>> beginPatchWithServiceResponseAsync(String resourceGroupName, String clusterName, ClusterInner parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (clusterName == null) {
+            throw new IllegalArgumentException("Parameter clusterName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginPatch(this.client.subscriptionId(), resourceGroupName, clusterName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ClusterInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ClusterInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ClusterInner> clientResponse = beginPatchDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ClusterInner> beginPatchDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ClusterInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ClusterInner>() { }.getType())
+                .register(201, new TypeToken<ClusterInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @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;ClusterInner&gt; object if successful.
+     */
+    public PagedList<ClusterInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ClusterInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ClusterInner>(response.body()) {
+            @Override
+            public Page<ClusterInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @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<ClusterInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ClusterInner>> serviceFuture, final ListOperationCallback<ClusterInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ClusterInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @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;ClusterInner&gt; object
+     */
+    public Observable<Page<ClusterInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ClusterInner>>, Page<ClusterInner>>() {
+                @Override
+                public Page<ClusterInner> call(ServiceResponse<Page<ClusterInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+     * @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;ClusterInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ClusterInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ClusterInner>>, Observable<ServiceResponse<Page<ClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ClusterInner>>> call(ServiceResponse<Page<ClusterInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Event Hubs Clusters within an ARM resource group.
+     *
+    ServiceResponse<PageImpl<ClusterInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ClusterInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ClusterInner>>> listByResourceGroupNextSinglePageAsync(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.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ClusterInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ClusterInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ClusterInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ClusterInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ClusterInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ClusterInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ClusterInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ConfigurationsImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ConfigurationsImpl.java
new file mode 100644
index 000000000000..6c4efa0e16ec
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ConfigurationsImpl.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Configurations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ClusterQuotaConfigurationProperties;
+
+class ConfigurationsImpl extends WrapperImpl<ConfigurationsInner> implements Configurations {
+    private final EventHubManager manager;
+
+    ConfigurationsImpl(EventHubManager manager) {
+        super(manager.inner().configurations());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ClusterQuotaConfigurationProperties> patchAsync(String resourceGroupName, String clusterName) {
+        ConfigurationsInner client = this.inner();
+        return client.patchAsync(resourceGroupName, clusterName)
+        .map(new Func1<ClusterQuotaConfigurationPropertiesInner, ClusterQuotaConfigurationProperties>() {
+            @Override
+            public ClusterQuotaConfigurationProperties call(ClusterQuotaConfigurationPropertiesInner inner) {
+                return new ClusterQuotaConfigurationPropertiesImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ClusterQuotaConfigurationProperties> getAsync(String resourceGroupName, String clusterName) {
+        ConfigurationsInner client = this.inner();
+        return client.getAsync(resourceGroupName, clusterName)
+        .map(new Func1<ClusterQuotaConfigurationPropertiesInner, ClusterQuotaConfigurationProperties>() {
+            @Override
+            public ClusterQuotaConfigurationProperties call(ClusterQuotaConfigurationPropertiesInner inner) {
+                return new ClusterQuotaConfigurationPropertiesImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ConfigurationsInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ConfigurationsInner.java
new file mode 100644
index 000000000000..f510fd8f724f
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ConfigurationsInner.java
@@ -0,0 +1,331 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ErrorResponseException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.Map;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Configurations.
+ */
+public class ConfigurationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ConfigurationsService service;
+    /** The service client containing this operation class. */
+    private EventHub2018PreviewManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ConfigurationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ConfigurationsInner(Retrofit retrofit, EventHub2018PreviewManagementClientImpl client) {
+        this.service = retrofit.create(ConfigurationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Configurations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ConfigurationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2018_01_01_preview.Configurations patch" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters/{clusterName}/quotaConfiguration/default")
+        Observable<Response<ResponseBody>> patch(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("clusterName") String clusterName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ClusterQuotaConfigurationPropertiesInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2018_01_01_preview.Configurations get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters/{clusterName}/quotaConfiguration/default")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("clusterName") String clusterName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @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 ClusterQuotaConfigurationPropertiesInner object if successful.
+     */
+    public ClusterQuotaConfigurationPropertiesInner patch(String resourceGroupName, String clusterName) {
+        return patchWithServiceResponseAsync(resourceGroupName, clusterName).toBlocking().single().body();
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @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<ClusterQuotaConfigurationPropertiesInner> patchAsync(String resourceGroupName, String clusterName, final ServiceCallback<ClusterQuotaConfigurationPropertiesInner> serviceCallback) {
+        return ServiceFuture.fromResponse(patchWithServiceResponseAsync(resourceGroupName, clusterName), serviceCallback);
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterQuotaConfigurationPropertiesInner object
+     */
+    public Observable<ClusterQuotaConfigurationPropertiesInner> patchAsync(String resourceGroupName, String clusterName) {
+        return patchWithServiceResponseAsync(resourceGroupName, clusterName).map(new Func1<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>, ClusterQuotaConfigurationPropertiesInner>() {
+            @Override
+            public ClusterQuotaConfigurationPropertiesInner call(ServiceResponse<ClusterQuotaConfigurationPropertiesInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterQuotaConfigurationPropertiesInner object
+     */
+    public Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>> patchWithServiceResponseAsync(String resourceGroupName, String clusterName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (clusterName == null) {
+            throw new IllegalArgumentException("Parameter clusterName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Map<String, String> settings = null;
+        ClusterQuotaConfigurationPropertiesInner parameters = new ClusterQuotaConfigurationPropertiesInner();
+        parameters.withSettings(null);
+        return service.patch(this.client.subscriptionId(), resourceGroupName, clusterName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ClusterQuotaConfigurationPropertiesInner> clientResponse = patchDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param settings All possible Cluster settings - a collection of key/value paired settings which apply to quotas and configurations imposed on the cluster.
+     * @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 ClusterQuotaConfigurationPropertiesInner object if successful.
+     */
+    public ClusterQuotaConfigurationPropertiesInner patch(String resourceGroupName, String clusterName, Map<String, String> settings) {
+        return patchWithServiceResponseAsync(resourceGroupName, clusterName, settings).toBlocking().single().body();
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param settings All possible Cluster settings - a collection of key/value paired settings which apply to quotas and configurations imposed on the cluster.
+     * @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<ClusterQuotaConfigurationPropertiesInner> patchAsync(String resourceGroupName, String clusterName, Map<String, String> settings, final ServiceCallback<ClusterQuotaConfigurationPropertiesInner> serviceCallback) {
+        return ServiceFuture.fromResponse(patchWithServiceResponseAsync(resourceGroupName, clusterName, settings), serviceCallback);
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param settings All possible Cluster settings - a collection of key/value paired settings which apply to quotas and configurations imposed on the cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterQuotaConfigurationPropertiesInner object
+     */
+    public Observable<ClusterQuotaConfigurationPropertiesInner> patchAsync(String resourceGroupName, String clusterName, Map<String, String> settings) {
+        return patchWithServiceResponseAsync(resourceGroupName, clusterName, settings).map(new Func1<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>, ClusterQuotaConfigurationPropertiesInner>() {
+            @Override
+            public ClusterQuotaConfigurationPropertiesInner call(ServiceResponse<ClusterQuotaConfigurationPropertiesInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Replace all specified Event Hubs Cluster settings with those contained in the request body. Leaves the settings not specified in the request body unmodified.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @param settings All possible Cluster settings - a collection of key/value paired settings which apply to quotas and configurations imposed on the cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterQuotaConfigurationPropertiesInner object
+     */
+    public Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>> patchWithServiceResponseAsync(String resourceGroupName, String clusterName, Map<String, String> settings) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (clusterName == null) {
+            throw new IllegalArgumentException("Parameter clusterName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(settings);
+        ClusterQuotaConfigurationPropertiesInner parameters = new ClusterQuotaConfigurationPropertiesInner();
+        parameters.withSettings(settings);
+        return service.patch(this.client.subscriptionId(), resourceGroupName, clusterName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ClusterQuotaConfigurationPropertiesInner> clientResponse = patchDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ClusterQuotaConfigurationPropertiesInner> patchDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ClusterQuotaConfigurationPropertiesInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ClusterQuotaConfigurationPropertiesInner>() { }.getType())
+                .register(201, new TypeToken<ClusterQuotaConfigurationPropertiesInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get all Event Hubs Cluster settings - a collection of key/value pairs which represent the quotas and settings imposed on the cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @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 ClusterQuotaConfigurationPropertiesInner object if successful.
+     */
+    public ClusterQuotaConfigurationPropertiesInner get(String resourceGroupName, String clusterName) {
+        return getWithServiceResponseAsync(resourceGroupName, clusterName).toBlocking().single().body();
+    }
+
+    /**
+     * Get all Event Hubs Cluster settings - a collection of key/value pairs which represent the quotas and settings imposed on the cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @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<ClusterQuotaConfigurationPropertiesInner> getAsync(String resourceGroupName, String clusterName, final ServiceCallback<ClusterQuotaConfigurationPropertiesInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, clusterName), serviceCallback);
+    }
+
+    /**
+     * Get all Event Hubs Cluster settings - a collection of key/value pairs which represent the quotas and settings imposed on the cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterQuotaConfigurationPropertiesInner object
+     */
+    public Observable<ClusterQuotaConfigurationPropertiesInner> getAsync(String resourceGroupName, String clusterName) {
+        return getWithServiceResponseAsync(resourceGroupName, clusterName).map(new Func1<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>, ClusterQuotaConfigurationPropertiesInner>() {
+            @Override
+            public ClusterQuotaConfigurationPropertiesInner call(ServiceResponse<ClusterQuotaConfigurationPropertiesInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get all Event Hubs Cluster settings - a collection of key/value pairs which represent the quotas and settings imposed on the cluster.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param clusterName The name of the Event Hubs Cluster.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ClusterQuotaConfigurationPropertiesInner object
+     */
+    public Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>> getWithServiceResponseAsync(String resourceGroupName, String clusterName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (clusterName == null) {
+            throw new IllegalArgumentException("Parameter clusterName 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.get(this.client.subscriptionId(), resourceGroupName, clusterName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ClusterQuotaConfigurationPropertiesInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ClusterQuotaConfigurationPropertiesInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ClusterQuotaConfigurationPropertiesInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ClusterQuotaConfigurationPropertiesInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ClusterQuotaConfigurationPropertiesInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EHNamespaceImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EHNamespaceImpl.java
new file mode 100644
index 000000000000..74b1dfcfea4d
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EHNamespaceImpl.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.EHNamespace;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Sku;
+import org.joda.time.DateTime;
+
+class EHNamespaceImpl extends GroupableResourceCoreImpl<EHNamespace, EHNamespaceInner, EHNamespaceImpl, EventHubManager> implements EHNamespace, EHNamespace.Definition, EHNamespace.Update {
+    EHNamespaceImpl(String name, EHNamespaceInner inner, EventHubManager manager) {
+        super(name, inner, manager);
+    }
+
+    @Override
+    public Observable<EHNamespace> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<EHNamespace> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.updateAsync(this.resourceGroupName(), this.name(), this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<EHNamespaceInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DateTime createdAt() {
+        return this.inner().createdAt();
+    }
+
+    @Override
+    public Boolean isAutoInflateEnabled() {
+        return this.inner().isAutoInflateEnabled();
+    }
+
+    @Override
+    public Boolean kafkaEnabled() {
+        return this.inner().kafkaEnabled();
+    }
+
+    @Override
+    public Integer maximumThroughputUnits() {
+        return this.inner().maximumThroughputUnits();
+    }
+
+    @Override
+    public String metricId() {
+        return this.inner().metricId();
+    }
+
+    @Override
+    public String provisioningState() {
+        return this.inner().provisioningState();
+    }
+
+    @Override
+    public String serviceBusEndpoint() {
+        return this.inner().serviceBusEndpoint();
+    }
+
+    @Override
+    public Sku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public DateTime updatedAt() {
+        return this.inner().updatedAt();
+    }
+
+    @Override
+    public Boolean zoneRedundant() {
+        return this.inner().zoneRedundant();
+    }
+
+    @Override
+    public EHNamespaceImpl withIsAutoInflateEnabled(Boolean isAutoInflateEnabled) {
+        this.inner().withIsAutoInflateEnabled(isAutoInflateEnabled);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withKafkaEnabled(Boolean kafkaEnabled) {
+        this.inner().withKafkaEnabled(kafkaEnabled);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withMaximumThroughputUnits(Integer maximumThroughputUnits) {
+        this.inner().withMaximumThroughputUnits(maximumThroughputUnits);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withSku(Sku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public EHNamespaceImpl withZoneRedundant(Boolean zoneRedundant) {
+        this.inner().withZoneRedundant(zoneRedundant);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EHNamespaceInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EHNamespaceInner.java
new file mode 100644
index 000000000000..6fc3667cfc3e
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EHNamespaceInner.java
@@ -0,0 +1,233 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Sku;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.rest.SkipParentValidation;
+import com.microsoft.azure.Resource;
+
+/**
+ * Single Namespace item in List or Get Operation.
+ */
+@JsonFlatten
+@SkipParentValidation
+public class EHNamespaceInner extends Resource {
+    /**
+     * Properties of sku resource.
+     */
+    @JsonProperty(value = "sku")
+    private Sku sku;
+
+    /**
+     * Provisioning state of the Namespace.
+     */
+    @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+    private String provisioningState;
+
+    /**
+     * The time the Namespace was created.
+     */
+    @JsonProperty(value = "properties.createdAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime createdAt;
+
+    /**
+     * The time the Namespace was updated.
+     */
+    @JsonProperty(value = "properties.updatedAt", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime updatedAt;
+
+    /**
+     * Endpoint you can use to perform Service Bus operations.
+     */
+    @JsonProperty(value = "properties.serviceBusEndpoint", access = JsonProperty.Access.WRITE_ONLY)
+    private String serviceBusEndpoint;
+
+    /**
+     * Identifier for Azure Insights metrics.
+     */
+    @JsonProperty(value = "properties.metricId", access = JsonProperty.Access.WRITE_ONLY)
+    private String metricId;
+
+    /**
+     * Value that indicates whether AutoInflate is enabled for eventhub
+     * namespace.
+     */
+    @JsonProperty(value = "properties.isAutoInflateEnabled")
+    private Boolean isAutoInflateEnabled;
+
+    /**
+     * Upper limit of throughput units when AutoInflate is enabled, value
+     * should be within 0 to 20 throughput units. ( '0' if AutoInflateEnabled =
+     * true).
+     */
+    @JsonProperty(value = "properties.maximumThroughputUnits")
+    private Integer maximumThroughputUnits;
+
+    /**
+     * Value that indicates whether Kafka is enabled for eventhub namespace.
+     */
+    @JsonProperty(value = "properties.kafkaEnabled")
+    private Boolean kafkaEnabled;
+
+    /**
+     * Enabling this property creates a Standard Event Hubs Namespace in
+     * regions supported availability zones.
+     */
+    @JsonProperty(value = "properties.zoneRedundant")
+    private Boolean zoneRedundant;
+
+    /**
+     * Get properties of sku resource.
+     *
+     * @return the sku value
+     */
+    public Sku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set properties of sku resource.
+     *
+     * @param sku the sku value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withSku(Sku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get provisioning state of the Namespace.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the time the Namespace was created.
+     *
+     * @return the createdAt value
+     */
+    public DateTime createdAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * Get the time the Namespace was updated.
+     *
+     * @return the updatedAt value
+     */
+    public DateTime updatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * Get endpoint you can use to perform Service Bus operations.
+     *
+     * @return the serviceBusEndpoint value
+     */
+    public String serviceBusEndpoint() {
+        return this.serviceBusEndpoint;
+    }
+
+    /**
+     * Get identifier for Azure Insights metrics.
+     *
+     * @return the metricId value
+     */
+    public String metricId() {
+        return this.metricId;
+    }
+
+    /**
+     * Get value that indicates whether AutoInflate is enabled for eventhub namespace.
+     *
+     * @return the isAutoInflateEnabled value
+     */
+    public Boolean isAutoInflateEnabled() {
+        return this.isAutoInflateEnabled;
+    }
+
+    /**
+     * Set value that indicates whether AutoInflate is enabled for eventhub namespace.
+     *
+     * @param isAutoInflateEnabled the isAutoInflateEnabled value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withIsAutoInflateEnabled(Boolean isAutoInflateEnabled) {
+        this.isAutoInflateEnabled = isAutoInflateEnabled;
+        return this;
+    }
+
+    /**
+     * Get upper limit of throughput units when AutoInflate is enabled, value should be within 0 to 20 throughput units. ( '0' if AutoInflateEnabled = true).
+     *
+     * @return the maximumThroughputUnits value
+     */
+    public Integer maximumThroughputUnits() {
+        return this.maximumThroughputUnits;
+    }
+
+    /**
+     * Set upper limit of throughput units when AutoInflate is enabled, value should be within 0 to 20 throughput units. ( '0' if AutoInflateEnabled = true).
+     *
+     * @param maximumThroughputUnits the maximumThroughputUnits value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withMaximumThroughputUnits(Integer maximumThroughputUnits) {
+        this.maximumThroughputUnits = maximumThroughputUnits;
+        return this;
+    }
+
+    /**
+     * Get value that indicates whether Kafka is enabled for eventhub namespace.
+     *
+     * @return the kafkaEnabled value
+     */
+    public Boolean kafkaEnabled() {
+        return this.kafkaEnabled;
+    }
+
+    /**
+     * Set value that indicates whether Kafka is enabled for eventhub namespace.
+     *
+     * @param kafkaEnabled the kafkaEnabled value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withKafkaEnabled(Boolean kafkaEnabled) {
+        this.kafkaEnabled = kafkaEnabled;
+        return this;
+    }
+
+    /**
+     * Get enabling this property creates a Standard Event Hubs Namespace in regions supported availability zones.
+     *
+     * @return the zoneRedundant value
+     */
+    public Boolean zoneRedundant() {
+        return this.zoneRedundant;
+    }
+
+    /**
+     * Set enabling this property creates a Standard Event Hubs Namespace in regions supported availability zones.
+     *
+     * @param zoneRedundant the zoneRedundant value to set
+     * @return the EHNamespaceInner object itself.
+     */
+    public EHNamespaceInner withZoneRedundant(Boolean zoneRedundant) {
+        this.zoneRedundant = zoneRedundant;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHub2018PreviewManagementClientImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHub2018PreviewManagementClientImpl.java
new file mode 100644
index 000000000000..44cfe720793b
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHub2018PreviewManagementClientImpl.java
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the EventHub2018PreviewManagementClientImpl class.
+ */
+public class EventHub2018PreviewManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. */
+    private String subscriptionId;
+
+    /**
+     * Gets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public EventHub2018PreviewManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** Client API version. */
+    private String apiVersion;
+
+    /**
+     * Gets Client API version.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public EventHub2018PreviewManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public EventHub2018PreviewManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public EventHub2018PreviewManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The OperationsInner object to access its operations.
+     */
+    private OperationsInner operations;
+
+    /**
+     * Gets the OperationsInner object to access its operations.
+     * @return the OperationsInner object.
+     */
+    public OperationsInner operations() {
+        return this.operations;
+    }
+
+    /**
+     * The ClustersInner object to access its operations.
+     */
+    private ClustersInner clusters;
+
+    /**
+     * Gets the ClustersInner object to access its operations.
+     * @return the ClustersInner object.
+     */
+    public ClustersInner clusters() {
+        return this.clusters;
+    }
+
+    /**
+     * The ConfigurationsInner object to access its operations.
+     */
+    private ConfigurationsInner configurations;
+
+    /**
+     * Gets the ConfigurationsInner object to access its operations.
+     * @return the ConfigurationsInner object.
+     */
+    public ConfigurationsInner configurations() {
+        return this.configurations;
+    }
+
+    /**
+     * The NamespacesInner object to access its operations.
+     */
+    private NamespacesInner namespaces;
+
+    /**
+     * Gets the NamespacesInner object to access its operations.
+     * @return the NamespacesInner object.
+     */
+    public NamespacesInner namespaces() {
+        return this.namespaces;
+    }
+
+    /**
+     * Initializes an instance of EventHub2018PreviewManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public EventHub2018PreviewManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of EventHub2018PreviewManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public EventHub2018PreviewManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of EventHub2018PreviewManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public EventHub2018PreviewManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2018-01-01-preview";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.clusters = new ClustersInner(restClient().retrofit(), this);
+        this.configurations = new ConfigurationsInner(restClient().retrofit(), this);
+        this.namespaces = new NamespacesInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "EventHub2018PreviewManagementClient", "2018-01-01-preview");
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHubClusterManagementClientImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHubClusterManagementClientImpl.java
new file mode 100644
index 000000000000..d59471bbd73b
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHubClusterManagementClientImpl.java
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the EventHubClusterManagementClientImpl class.
+ */
+public class EventHubClusterManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. */
+    private String subscriptionId;
+
+    /**
+     * Gets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public EventHubClusterManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** Client API version. */
+    private String apiVersion;
+
+    /**
+     * Gets Client API version.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public EventHubClusterManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public EventHubClusterManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public EventHubClusterManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The OperationsInner object to access its operations.
+     */
+    private OperationsInner operations;
+
+    /**
+     * Gets the OperationsInner object to access its operations.
+     * @return the OperationsInner object.
+     */
+    public OperationsInner operations() {
+        return this.operations;
+    }
+
+    /**
+     * The ClustersInner object to access its operations.
+     */
+    private ClustersInner clusters;
+
+    /**
+     * Gets the ClustersInner object to access its operations.
+     * @return the ClustersInner object.
+     */
+    public ClustersInner clusters() {
+        return this.clusters;
+    }
+
+    /**
+     * The ConfigurationsInner object to access its operations.
+     */
+    private ConfigurationsInner configurations;
+
+    /**
+     * Gets the ConfigurationsInner object to access its operations.
+     * @return the ConfigurationsInner object.
+     */
+    public ConfigurationsInner configurations() {
+        return this.configurations;
+    }
+
+    /**
+     * Initializes an instance of EventHubClusterManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public EventHubClusterManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of EventHubClusterManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public EventHubClusterManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of EventHubClusterManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public EventHubClusterManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2018-01-01-preview";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.clusters = new ClustersInner(restClient().retrofit(), this);
+        this.configurations = new ConfigurationsInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "EventHubClusterManagementClient", "2018-01-01-preview");
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHubManager.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHubManager.java
new file mode 100644
index 000000000000..208fd4ba8626
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/EventHubManager.java
@@ -0,0 +1,135 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Operations;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Clusters;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Configurations;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Namespaces;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure EventHub resource management.
+ */
+public final class EventHubManager extends ManagerCore<EventHubManager, EventHub2018PreviewManagementClientImpl> {
+    private Operations operations;
+    private Clusters clusters;
+    private Configurations configurations;
+    private Namespaces namespaces;
+    /**
+    * Get a Configurable instance that can be used to create EventHubManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new EventHubManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of EventHubManager that exposes EventHub resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the EventHubManager
+    */
+    public static EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new EventHubManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of EventHubManager that exposes EventHub resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the EventHubManager
+    */
+    public static EventHubManager authenticate(RestClient restClient, String subscriptionId) {
+        return new EventHubManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of EventHubManager that exposes EventHub management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing EventHub management API entry points that work across subscriptions
+        */
+        EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+     * @return Entry point to manage Clusters.
+     */
+    public Clusters clusters() {
+        if (this.clusters == null) {
+            this.clusters = new ClustersImpl(this);
+        }
+        return this.clusters;
+    }
+
+    /**
+     * @return Entry point to manage Configurations.
+     */
+    public Configurations configurations() {
+        if (this.configurations == null) {
+            this.configurations = new ConfigurationsImpl(this);
+        }
+        return this.configurations;
+    }
+
+    /**
+     * @return Entry point to manage Namespaces.
+     */
+    public Namespaces namespaces() {
+        if (this.namespaces == null) {
+            this.namespaces = new NamespacesImpl(this);
+        }
+        return this.namespaces;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public EventHubManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return EventHubManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private EventHubManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new EventHub2018PreviewManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IdParsingUtils.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..4560a155e739
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IdParsingUtils.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+import java.util.Arrays;
+import java.util.Iterator;
+
+class IdParsingUtils {
+    public static String getValueFromIdByName(String id, String name) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator<String> itr = iterable.iterator();
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (part.equalsIgnoreCase(name)) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getValueFromIdByPosition(String id, int pos) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator <String> itr = iterable.iterator();
+        int index = 0;
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (index == pos) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+            index++;
+        }
+        return null;
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IpFilterRuleImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IpFilterRuleImpl.java
new file mode 100644
index 000000000000..d9e147ced478
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IpFilterRuleImpl.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.IpFilterRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.IPAction;
+
+class IpFilterRuleImpl extends CreatableUpdatableImpl<IpFilterRule, IpFilterRuleInner, IpFilterRuleImpl> implements IpFilterRule, IpFilterRule.Definition, IpFilterRule.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String ipFilterRuleName;
+
+    IpFilterRuleImpl(String name, EventHubManager manager) {
+        super(name, new IpFilterRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.ipFilterRuleName = name;
+        //
+    }
+
+    IpFilterRuleImpl(IpFilterRuleInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.ipFilterRuleName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.ipFilterRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "ipfilterrules");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<IpFilterRule> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateIpFilterRuleAsync(this.resourceGroupName, this.namespaceName, this.ipFilterRuleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<IpFilterRule> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateIpFilterRuleAsync(this.resourceGroupName, this.namespaceName, this.ipFilterRuleName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<IpFilterRuleInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getIpFilterRuleAsync(this.resourceGroupName, this.namespaceName, this.ipFilterRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public IPAction action() {
+        return this.inner().action();
+    }
+
+    @Override
+    public String filterName() {
+        return this.inner().filterName();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String ipMask() {
+        return this.inner().ipMask();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public IpFilterRuleImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+    @Override
+    public IpFilterRuleImpl withAction(IPAction action) {
+        this.inner().withAction(action);
+        return this;
+    }
+
+    @Override
+    public IpFilterRuleImpl withFilterName(String filterName) {
+        this.inner().withFilterName(filterName);
+        return this;
+    }
+
+    @Override
+    public IpFilterRuleImpl withIpMask(String ipMask) {
+        this.inner().withIpMask(ipMask);
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IpFilterRuleInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IpFilterRuleInner.java
new file mode 100644
index 000000000000..624a246c143a
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/IpFilterRuleInner.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.IPAction;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in a List or Get IpFilterRules operation.
+ */
+@JsonFlatten
+public class IpFilterRuleInner extends ProxyResource {
+    /**
+     * IP Mask.
+     */
+    @JsonProperty(value = "properties.ipMask")
+    private String ipMask;
+
+    /**
+     * The IP Filter Action. Possible values include: 'Accept', 'Reject'.
+     */
+    @JsonProperty(value = "properties.action")
+    private IPAction action;
+
+    /**
+     * IP Filter name.
+     */
+    @JsonProperty(value = "properties.filterName")
+    private String filterName;
+
+    /**
+     * Get iP Mask.
+     *
+     * @return the ipMask value
+     */
+    public String ipMask() {
+        return this.ipMask;
+    }
+
+    /**
+     * Set iP Mask.
+     *
+     * @param ipMask the ipMask value to set
+     * @return the IpFilterRuleInner object itself.
+     */
+    public IpFilterRuleInner withIpMask(String ipMask) {
+        this.ipMask = ipMask;
+        return this;
+    }
+
+    /**
+     * Get the IP Filter Action. Possible values include: 'Accept', 'Reject'.
+     *
+     * @return the action value
+     */
+    public IPAction action() {
+        return this.action;
+    }
+
+    /**
+     * Set the IP Filter Action. Possible values include: 'Accept', 'Reject'.
+     *
+     * @param action the action value to set
+     * @return the IpFilterRuleInner object itself.
+     */
+    public IpFilterRuleInner withAction(IPAction action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get iP Filter name.
+     *
+     * @return the filterName value
+     */
+    public String filterName() {
+        return this.filterName;
+    }
+
+    /**
+     * Set iP Filter name.
+     *
+     * @param filterName the filterName value to set
+     * @return the IpFilterRuleInner object itself.
+     */
+    public IpFilterRuleInner withFilterName(String filterName) {
+        this.filterName = filterName;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NamespacesImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NamespacesImpl.java
new file mode 100644
index 000000000000..4c18803ec5d0
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NamespacesImpl.java
@@ -0,0 +1,279 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * def
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Namespaces;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.EHNamespace;
+import rx.Observable;
+import rx.Completable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import com.microsoft.azure.arm.resources.ResourceUtilsCore;
+import com.microsoft.azure.arm.utils.RXMapper;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.IpFilterRule;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.VirtualNetworkRule;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NetworkRuleSet;
+
+class NamespacesImpl extends GroupableResourcesCoreImpl<EHNamespace, EHNamespaceImpl, EHNamespaceInner, NamespacesInner, EventHubManager>  implements Namespaces {
+    protected NamespacesImpl(EventHubManager manager) {
+        super(manager.inner().namespaces(), manager);
+    }
+
+    @Override
+    protected Observable<EHNamespaceInner> getInnerAsync(String resourceGroupName, String name) {
+        NamespacesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        NamespacesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(Collection<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Observable.empty();
+        }
+        Collection<Observable<String>> observables = new ArrayList<>();
+        for (String id : ids) {
+            final String resourceGroupName = ResourceUtilsCore.groupFromResourceId(id);
+            final String name = ResourceUtilsCore.nameFromResourceId(id);
+            Observable<String> o = RXMapper.map(this.inner().deleteAsync(resourceGroupName, name), id);
+            observables.add(o);
+        }
+        return Observable.mergeDelayError(observables);
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(String...ids) {
+        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public void deleteByIds(Collection<String> ids) {
+        if (ids != null && !ids.isEmpty()) {
+            this.deleteByIdsAsync(ids).toBlocking().last();
+        }
+    }
+
+    @Override
+    public void deleteByIds(String...ids) {
+        this.deleteByIds(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public PagedList<EHNamespace> listByResourceGroup(String resourceGroupName) {
+        NamespacesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<EHNamespace> listByResourceGroupAsync(String resourceGroupName) {
+        NamespacesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<EHNamespaceInner>, Iterable<EHNamespaceInner>>() {
+            @Override
+            public Iterable<EHNamespaceInner> call(Page<EHNamespaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EHNamespaceInner, EHNamespace>() {
+            @Override
+            public EHNamespace call(EHNamespaceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<EHNamespace> list() {
+        NamespacesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<EHNamespace> listAsync() {
+        NamespacesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<EHNamespaceInner>, Iterable<EHNamespaceInner>>() {
+            @Override
+            public Iterable<EHNamespaceInner> call(Page<EHNamespaceInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<EHNamespaceInner, EHNamespace>() {
+            @Override
+            public EHNamespace call(EHNamespaceInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public EHNamespaceImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    protected EHNamespaceImpl wrapModel(EHNamespaceInner inner) {
+        return  new EHNamespaceImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected EHNamespaceImpl wrapModel(String name) {
+        return new EHNamespaceImpl(name, new EHNamespaceInner(), this.manager());
+    }
+
+    @Override
+    public IpFilterRuleImpl defineIpfilterrule(String name) {
+        return wrapIpfilterruleModel(name);
+    }
+
+    @Override
+    public VirtualNetworkRuleImpl defineVirtualnetworkrule(String name) {
+        return wrapVirtualnetworkruleModel(name);
+    }
+
+    private IpFilterRuleImpl wrapIpfilterruleModel(String name) {
+        return new IpFilterRuleImpl(name, this.manager());
+    }
+
+    private VirtualNetworkRuleImpl wrapVirtualnetworkruleModel(String name) {
+        return new VirtualNetworkRuleImpl(name, this.manager());
+    }
+
+    private IpFilterRuleImpl wrapIpFilterRuleModel(IpFilterRuleInner inner) {
+        return  new IpFilterRuleImpl(inner, manager());
+    }
+
+    private VirtualNetworkRuleImpl wrapVirtualNetworkRuleModel(VirtualNetworkRuleInner inner) {
+        return  new VirtualNetworkRuleImpl(inner, manager());
+    }
+
+    private Observable<IpFilterRuleInner> getIpFilterRuleInnerUsingNamespacesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String ipFilterRuleName = IdParsingUtils.getValueFromIdByName(id, "ipfilterrules");
+        NamespacesInner client = this.inner();
+        return client.getIpFilterRuleAsync(resourceGroupName, namespaceName, ipFilterRuleName);
+    }
+
+    private Observable<VirtualNetworkRuleInner> getVirtualNetworkRuleInnerUsingNamespacesInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
+        String virtualNetworkRuleName = IdParsingUtils.getValueFromIdByName(id, "virtualnetworkrules");
+        NamespacesInner client = this.inner();
+        return client.getVirtualNetworkRuleAsync(resourceGroupName, namespaceName, virtualNetworkRuleName);
+    }
+
+    @Override
+    public Observable<IpFilterRule> getIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        NamespacesInner client = this.inner();
+        return client.getIpFilterRuleAsync(resourceGroupName, namespaceName, ipFilterRuleName)
+        .map(new Func1<IpFilterRuleInner, IpFilterRule>() {
+            @Override
+            public IpFilterRule call(IpFilterRuleInner inner) {
+                return wrapIpFilterRuleModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<IpFilterRule> listIPFilterRulesAsync(final String resourceGroupName, final String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.listIPFilterRulesAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<IpFilterRuleInner>, Iterable<IpFilterRuleInner>>() {
+            @Override
+            public Iterable<IpFilterRuleInner> call(Page<IpFilterRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<IpFilterRuleInner, IpFilterRule>() {
+            @Override
+            public IpFilterRule call(IpFilterRuleInner inner) {
+                return wrapIpFilterRuleModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        NamespacesInner client = this.inner();
+        return client.deleteIpFilterRuleAsync(resourceGroupName, namespaceName, ipFilterRuleName).toCompletable();
+    }
+
+    @Override
+    public Observable<VirtualNetworkRule> getVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        NamespacesInner client = this.inner();
+        return client.getVirtualNetworkRuleAsync(resourceGroupName, namespaceName, virtualNetworkRuleName)
+        .map(new Func1<VirtualNetworkRuleInner, VirtualNetworkRule>() {
+            @Override
+            public VirtualNetworkRule call(VirtualNetworkRuleInner inner) {
+                return wrapVirtualNetworkRuleModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<VirtualNetworkRule> listVirtualNetworkRulesAsync(final String resourceGroupName, final String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.listVirtualNetworkRulesAsync(resourceGroupName, namespaceName)
+        .flatMapIterable(new Func1<Page<VirtualNetworkRuleInner>, Iterable<VirtualNetworkRuleInner>>() {
+            @Override
+            public Iterable<VirtualNetworkRuleInner> call(Page<VirtualNetworkRuleInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualNetworkRuleInner, VirtualNetworkRule>() {
+            @Override
+            public VirtualNetworkRule call(VirtualNetworkRuleInner inner) {
+                return wrapVirtualNetworkRuleModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        NamespacesInner client = this.inner();
+        return client.deleteVirtualNetworkRuleAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).toCompletable();
+    }
+
+    @Override
+    public Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
+        NamespacesInner client = this.inner();
+        return client.createOrUpdateNetworkRuleSetAsync(resourceGroupName, namespaceName, parameters)
+        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
+            @Override
+            public NetworkRuleSet call(NetworkRuleSetInner inner) {
+                return new NetworkRuleSetImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkRuleSet> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.getNetworkRuleSetAsync(resourceGroupName, namespaceName)
+        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
+            @Override
+            public NetworkRuleSet call(NetworkRuleSetInner inner) {
+                return new NetworkRuleSetImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NamespacesInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NamespacesInner.java
new file mode 100644
index 000000000000..19417d46574a
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NamespacesInner.java
@@ -0,0 +1,2422 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Namespaces.
+ */
+public class NamespacesInner implements InnerSupportsGet<EHNamespaceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<EHNamespaceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private NamespacesService service;
+    /** The service client containing this operation class. */
+    private EventHub2018PreviewManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NamespacesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public NamespacesInner(Retrofit retrofit, EventHub2018PreviewManagementClientImpl client) {
+        this.service = retrofit.create(NamespacesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Namespaces to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface NamespacesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2018_01_01_preview.Namespaces list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.EventHub/namespaces")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2018_01_01_preview.Namespaces listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @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.eventhub.v2018_01_01_preview.Namespaces createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body EHNamespaceInner parameters, @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.eventhub.v2018_01_01_preview.Namespaces beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body EHNamespaceInner parameters, @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.eventhub.v2018_01_01_preview.Namespaces delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@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.eventhub.v2018_01_01_preview.Namespaces beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@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.eventhub.v2018_01_01_preview.Namespaces getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@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.eventhub.v2018_01_01_preview.Namespaces update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}")
+        Observable<Response<ResponseBody>> update(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Body EHNamespaceInner parameters, @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.eventhub.v2018_01_01_preview.Namespaces listIPFilterRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules")
+        Observable<Response<ResponseBody>> listIPFilterRules(@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.eventhub.v2018_01_01_preview.Namespaces createOrUpdateIpFilterRule" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdateIpFilterRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("ipFilterRuleName") String ipFilterRuleName, @Path("subscriptionId") String subscriptionId, @Body IpFilterRuleInner parameters, @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.eventhub.v2018_01_01_preview.Namespaces deleteIpFilterRule" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteIpFilterRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("ipFilterRuleName") String ipFilterRuleName, @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.eventhub.v2018_01_01_preview.Namespaces getIpFilterRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/ipfilterrules/{ipFilterRuleName}")
+        Observable<Response<ResponseBody>> getIpFilterRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("ipFilterRuleName") String ipFilterRuleName, @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.eventhub.v2018_01_01_preview.Namespaces listVirtualNetworkRules" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules")
+        Observable<Response<ResponseBody>> listVirtualNetworkRules(@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.eventhub.v2018_01_01_preview.Namespaces createOrUpdateVirtualNetworkRule" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules/{virtualNetworkRuleName}")
+        Observable<Response<ResponseBody>> createOrUpdateVirtualNetworkRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("virtualNetworkRuleName") String virtualNetworkRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body VirtualNetworkRuleInner parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2018_01_01_preview.Namespaces deleteVirtualNetworkRule" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules/{virtualNetworkRuleName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteVirtualNetworkRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("virtualNetworkRuleName") String virtualNetworkRuleName, @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.eventhub.v2018_01_01_preview.Namespaces getVirtualNetworkRule" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/virtualnetworkrules/{virtualNetworkRuleName}")
+        Observable<Response<ResponseBody>> getVirtualNetworkRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("virtualNetworkRuleName") String virtualNetworkRuleName, @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.eventhub.v2018_01_01_preview.Namespaces createOrUpdateNetworkRuleSet" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSets/default")
+        Observable<Response<ResponseBody>> createOrUpdateNetworkRuleSet(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Body NetworkRuleSetInner parameters, @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.eventhub.v2018_01_01_preview.Namespaces getNetworkRuleSet" })
+        @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.eventhub.v2018_01_01_preview.Namespaces listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@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.eventhub.v2018_01_01_preview.Namespaces listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@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.eventhub.v2018_01_01_preview.Namespaces listIPFilterRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listIPFilterRulesNext(@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.eventhub.v2018_01_01_preview.Namespaces listVirtualNetworkRulesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listVirtualNetworkRulesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> list() {
+        ServiceResponse<Page<EHNamespaceInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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<EHNamespaceInner>> listAsync(final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listSinglePageAsync() {
+        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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<EHNamespaceInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @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<EHNamespaceInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+    ServiceResponse<PageImpl<EHNamespaceInner>> * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName 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.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner createOrUpdate(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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<EHNamespaceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<EHNamespaceInner> createOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<EHNamespaceInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner beginCreateOrUpdate(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @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<EHNamespaceInner> beginCreateOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<EHNamespaceInner> beginCreateOrUpdateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for creating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreateOrUpdate(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EHNamespaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EHNamespaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EHNamespaceInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EHNamespaceInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EHNamespaceInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(201, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public void delete(String resourceGroupName, String namespaceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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<Void> deleteAsync(String resourceGroupName, String namespaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String namespaceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, 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.");
+        }
+        Observable<Response<ResponseBody>> observable = service.delete(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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
+     */
+    public void beginDelete(String resourceGroupName, String namespaceName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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<Void> beginDeleteAsync(String resourceGroupName, String namespaceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String namespaceName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an existing namespace. This operation also removes all associated resources under the 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 {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, 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.beginDelete(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the description of the specified 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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner getByResourceGroup(String resourceGroupName, String namespaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the description of the specified 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<EHNamespaceInner> getByResourceGroupAsync(String resourceGroupName, String namespaceName, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Gets the description of the specified 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 EHNamespaceInner object
+     */
+    public Observable<EHNamespaceInner> getByResourceGroupAsync(String resourceGroupName, String namespaceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the description of the specified 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 EHNamespaceInner object
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, 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.getByResourceGroup(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EHNamespaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EHNamespaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EHNamespaceInner> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EHNamespaceInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EHNamespaceInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(201, new TypeToken<EHNamespaceInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @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 EHNamespaceInner object if successful.
+     */
+    public EHNamespaceInner update(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @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<EHNamespaceInner> updateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters, final ServiceCallback<EHNamespaceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<EHNamespaceInner> updateAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<EHNamespaceInner>, EHNamespaceInner>() {
+            @Override
+            public EHNamespaceInner call(ServiceResponse<EHNamespaceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters Parameters for updating a namespace resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the EHNamespaceInner object
+     */
+    public Observable<ServiceResponse<EHNamespaceInner>> updateWithServiceResponseAsync(String resourceGroupName, String namespaceName, EHNamespaceInner parameters) {
+        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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.update(resourceGroupName, namespaceName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EHNamespaceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<EHNamespaceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<EHNamespaceInner> clientResponse = updateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<EHNamespaceInner> updateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<EHNamespaceInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(201, new TypeToken<EHNamespaceInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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;IpFilterRuleInner&gt; object if successful.
+     */
+    public PagedList<IpFilterRuleInner> listIPFilterRules(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<IpFilterRuleInner>> response = listIPFilterRulesSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<IpFilterRuleInner>(response.body()) {
+            @Override
+            public Page<IpFilterRuleInner> nextPage(String nextPageLink) {
+                return listIPFilterRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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<IpFilterRuleInner>> listIPFilterRulesAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<IpFilterRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listIPFilterRulesSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<IpFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpFilterRuleInner>>> call(String nextPageLink) {
+                    return listIPFilterRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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;IpFilterRuleInner&gt; object
+     */
+    public Observable<Page<IpFilterRuleInner>> listIPFilterRulesAsync(final String resourceGroupName, final String namespaceName) {
+        return listIPFilterRulesWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<IpFilterRuleInner>>, Page<IpFilterRuleInner>>() {
+                @Override
+                public Page<IpFilterRuleInner> call(ServiceResponse<Page<IpFilterRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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;IpFilterRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpFilterRuleInner>>> listIPFilterRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listIPFilterRulesSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<IpFilterRuleInner>>, Observable<ServiceResponse<Page<IpFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpFilterRuleInner>>> call(ServiceResponse<Page<IpFilterRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listIPFilterRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of IP Filter rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<IpFilterRuleInner>> * @param resourceGroupName Name of the resource group within the Azure subscription.
+    ServiceResponse<PageImpl<IpFilterRuleInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpFilterRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpFilterRuleInner>>> listIPFilterRulesSinglePageAsync(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.listIPFilterRules(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<IpFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpFilterRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpFilterRuleInner>> result = listIPFilterRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpFilterRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpFilterRuleInner>> listIPFilterRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpFilterRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpFilterRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @param parameters The Namespace IpFilterRule.
+     * @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 IpFilterRuleInner object if successful.
+     */
+    public IpFilterRuleInner createOrUpdateIpFilterRule(String resourceGroupName, String namespaceName, String ipFilterRuleName, IpFilterRuleInner parameters) {
+        return createOrUpdateIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @param parameters The Namespace IpFilterRule.
+     * @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<IpFilterRuleInner> createOrUpdateIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName, IpFilterRuleInner parameters, final ServiceCallback<IpFilterRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @param parameters The Namespace IpFilterRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpFilterRuleInner object
+     */
+    public Observable<IpFilterRuleInner> createOrUpdateIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName, IpFilterRuleInner parameters) {
+        return createOrUpdateIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName, parameters).map(new Func1<ServiceResponse<IpFilterRuleInner>, IpFilterRuleInner>() {
+            @Override
+            public IpFilterRuleInner call(ServiceResponse<IpFilterRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @param parameters The Namespace IpFilterRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpFilterRuleInner object
+     */
+    public Observable<ServiceResponse<IpFilterRuleInner>> createOrUpdateIpFilterRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName, IpFilterRuleInner parameters) {
+        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 (ipFilterRuleName == null) {
+            throw new IllegalArgumentException("Parameter ipFilterRuleName 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 (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdateIpFilterRule(resourceGroupName, namespaceName, ipFilterRuleName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpFilterRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpFilterRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpFilterRuleInner> clientResponse = createOrUpdateIpFilterRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpFilterRuleInner> createOrUpdateIpFilterRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpFilterRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpFilterRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule 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
+     */
+    public void deleteIpFilterRule(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        deleteIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule 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<Void> deleteIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        return deleteIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an IpFilterRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteIpFilterRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        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 (ipFilterRuleName == null) {
+            throw new IllegalArgumentException("Parameter ipFilterRuleName 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.deleteIpFilterRule(resourceGroupName, namespaceName, ipFilterRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteIpFilterRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteIpFilterRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an IpFilterRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule 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 IpFilterRuleInner object if successful.
+     */
+    public IpFilterRuleInner getIpFilterRule(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        return getIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an IpFilterRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule 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<IpFilterRuleInner> getIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName, final ServiceCallback<IpFilterRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an IpFilterRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpFilterRuleInner object
+     */
+    public Observable<IpFilterRuleInner> getIpFilterRuleAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        return getIpFilterRuleWithServiceResponseAsync(resourceGroupName, namespaceName, ipFilterRuleName).map(new Func1<ServiceResponse<IpFilterRuleInner>, IpFilterRuleInner>() {
+            @Override
+            public IpFilterRuleInner call(ServiceResponse<IpFilterRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an IpFilterRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param ipFilterRuleName The IP Filter Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the IpFilterRuleInner object
+     */
+    public Observable<ServiceResponse<IpFilterRuleInner>> getIpFilterRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String ipFilterRuleName) {
+        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 (ipFilterRuleName == null) {
+            throw new IllegalArgumentException("Parameter ipFilterRuleName 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.getIpFilterRule(resourceGroupName, namespaceName, ipFilterRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<IpFilterRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<IpFilterRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<IpFilterRuleInner> clientResponse = getIpFilterRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<IpFilterRuleInner> getIpFilterRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<IpFilterRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<IpFilterRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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;VirtualNetworkRuleInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkRuleInner> listVirtualNetworkRules(final String resourceGroupName, final String namespaceName) {
+        ServiceResponse<Page<VirtualNetworkRuleInner>> response = listVirtualNetworkRulesSinglePageAsync(resourceGroupName, namespaceName).toBlocking().single();
+        return new PagedList<VirtualNetworkRuleInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkRuleInner> nextPage(String nextPageLink) {
+                return listVirtualNetworkRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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<VirtualNetworkRuleInner>> listVirtualNetworkRulesAsync(final String resourceGroupName, final String namespaceName, final ListOperationCallback<VirtualNetworkRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualNetworkRulesSinglePageAsync(resourceGroupName, namespaceName),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(String nextPageLink) {
+                    return listVirtualNetworkRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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;VirtualNetworkRuleInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkRuleInner>> listVirtualNetworkRulesAsync(final String resourceGroupName, final String namespaceName) {
+        return listVirtualNetworkRulesWithServiceResponseAsync(resourceGroupName, namespaceName)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkRuleInner>>, Page<VirtualNetworkRuleInner>>() {
+                @Override
+                public Page<VirtualNetworkRuleInner> call(ServiceResponse<Page<VirtualNetworkRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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;VirtualNetworkRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> listVirtualNetworkRulesWithServiceResponseAsync(final String resourceGroupName, final String namespaceName) {
+        return listVirtualNetworkRulesSinglePageAsync(resourceGroupName, namespaceName)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkRuleInner>>, Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(ServiceResponse<Page<VirtualNetworkRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualNetworkRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkRuleInner>> * @param resourceGroupName Name of the resource group within the Azure subscription.
+    ServiceResponse<PageImpl<VirtualNetworkRuleInner>> * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> listVirtualNetworkRulesSinglePageAsync(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.listVirtualNetworkRules(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkRuleInner>> result = listVirtualNetworkRulesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkRuleInner>> listVirtualNetworkRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule 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 VirtualNetworkRuleInner object if successful.
+     */
+    public VirtualNetworkRuleInner createOrUpdateVirtualNetworkRule(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        return createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule 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<VirtualNetworkRuleInner> createOrUpdateVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, final ServiceCallback<VirtualNetworkRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkRuleInner object
+     */
+    public Observable<VirtualNetworkRuleInner> createOrUpdateVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        return createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).map(new Func1<ServiceResponse<VirtualNetworkRuleInner>, VirtualNetworkRuleInner>() {
+            @Override
+            public VirtualNetworkRuleInner call(ServiceResponse<VirtualNetworkRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkRuleInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkRuleInner>> createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        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 (virtualNetworkRuleName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkRuleName 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.");
+        }
+        final String virtualNetworkSubnetId = null;
+        VirtualNetworkRuleInner parameters = new VirtualNetworkRuleInner();
+        parameters.withVirtualNetworkSubnetId(null);
+        return service.createOrUpdateVirtualNetworkRule(resourceGroupName, namespaceName, virtualNetworkRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkRuleInner> clientResponse = createOrUpdateVirtualNetworkRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @param virtualNetworkSubnetId ARM ID of Virtual Network Subnet
+     * @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 VirtualNetworkRuleInner object if successful.
+     */
+    public VirtualNetworkRuleInner createOrUpdateVirtualNetworkRule(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, String virtualNetworkSubnetId) {
+        return createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName, virtualNetworkSubnetId).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @param virtualNetworkSubnetId ARM ID of Virtual Network Subnet
+     * @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<VirtualNetworkRuleInner> createOrUpdateVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, String virtualNetworkSubnetId, final ServiceCallback<VirtualNetworkRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName, virtualNetworkSubnetId), serviceCallback);
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @param virtualNetworkSubnetId ARM ID of Virtual Network Subnet
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkRuleInner object
+     */
+    public Observable<VirtualNetworkRuleInner> createOrUpdateVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, String virtualNetworkSubnetId) {
+        return createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName, virtualNetworkSubnetId).map(new Func1<ServiceResponse<VirtualNetworkRuleInner>, VirtualNetworkRuleInner>() {
+            @Override
+            public VirtualNetworkRuleInner call(ServiceResponse<VirtualNetworkRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @param virtualNetworkSubnetId ARM ID of Virtual Network Subnet
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkRuleInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkRuleInner>> createOrUpdateVirtualNetworkRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, String virtualNetworkSubnetId) {
+        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 (virtualNetworkRuleName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkRuleName 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.");
+        }
+        VirtualNetworkRuleInner parameters = new VirtualNetworkRuleInner();
+        parameters.withVirtualNetworkSubnetId(virtualNetworkSubnetId);
+        return service.createOrUpdateVirtualNetworkRule(resourceGroupName, namespaceName, virtualNetworkRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkRuleInner> clientResponse = createOrUpdateVirtualNetworkRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkRuleInner> createOrUpdateVirtualNetworkRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule 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
+     */
+    public void deleteVirtualNetworkRule(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        deleteVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule 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<Void> deleteVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName), serviceCallback);
+    }
+
+    /**
+     * Deletes an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        return deleteVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes an VirtualNetworkRule for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteVirtualNetworkRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        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 (virtualNetworkRuleName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkRuleName 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.deleteVirtualNetworkRule(resourceGroupName, namespaceName, virtualNetworkRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteVirtualNetworkRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteVirtualNetworkRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets an VirtualNetworkRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule 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 VirtualNetworkRuleInner object if successful.
+     */
+    public VirtualNetworkRuleInner getVirtualNetworkRule(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        return getVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets an VirtualNetworkRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule 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<VirtualNetworkRuleInner> getVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName, final ServiceCallback<VirtualNetworkRuleInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName), serviceCallback);
+    }
+
+    /**
+     * Gets an VirtualNetworkRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkRuleInner object
+     */
+    public Observable<VirtualNetworkRuleInner> getVirtualNetworkRuleAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        return getVirtualNetworkRuleWithServiceResponseAsync(resourceGroupName, namespaceName, virtualNetworkRuleName).map(new Func1<ServiceResponse<VirtualNetworkRuleInner>, VirtualNetworkRuleInner>() {
+            @Override
+            public VirtualNetworkRuleInner call(ServiceResponse<VirtualNetworkRuleInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets an VirtualNetworkRule for a Namespace by rule name.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param virtualNetworkRuleName The Virtual Network Rule name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the VirtualNetworkRuleInner object
+     */
+    public Observable<ServiceResponse<VirtualNetworkRuleInner>> getVirtualNetworkRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String virtualNetworkRuleName) {
+        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 (virtualNetworkRuleName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkRuleName 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.getVirtualNetworkRule(resourceGroupName, namespaceName, virtualNetworkRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<VirtualNetworkRuleInner>>>() {
+                @Override
+                public Observable<ServiceResponse<VirtualNetworkRuleInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<VirtualNetworkRuleInner> clientResponse = getVirtualNetworkRuleDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<VirtualNetworkRuleInner> getVirtualNetworkRuleDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VirtualNetworkRuleInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<VirtualNetworkRuleInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Create or update NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters The Namespace IpFilterRule.
+     * @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 NetworkRuleSetInner object if successful.
+     */
+    public NetworkRuleSetInner createOrUpdateNetworkRuleSet(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
+        return createOrUpdateNetworkRuleSetWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create or update NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters The Namespace IpFilterRule.
+     * @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<NetworkRuleSetInner> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters, final ServiceCallback<NetworkRuleSetInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateNetworkRuleSetWithServiceResponseAsync(resourceGroupName, namespaceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create or update NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters The Namespace IpFilterRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkRuleSetInner object
+     */
+    public Observable<NetworkRuleSetInner> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
+        return createOrUpdateNetworkRuleSetWithServiceResponseAsync(resourceGroupName, namespaceName, parameters).map(new Func1<ServiceResponse<NetworkRuleSetInner>, NetworkRuleSetInner>() {
+            @Override
+            public NetworkRuleSetInner call(ServiceResponse<NetworkRuleSetInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create or update NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the Azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters The Namespace IpFilterRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkRuleSetInner object
+     */
+    public Observable<ServiceResponse<NetworkRuleSetInner>> createOrUpdateNetworkRuleSetWithServiceResponseAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
+        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.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdateNetworkRuleSet(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkRuleSetInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkRuleSetInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkRuleSetInner> clientResponse = createOrUpdateNetworkRuleSetDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkRuleSetInner> createOrUpdateNetworkRuleSetDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkRuleSetInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkRuleSetInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets 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 NetworkRuleSetInner object if successful.
+     */
+    public NetworkRuleSetInner getNetworkRuleSet(String resourceGroupName, String namespaceName) {
+        return getNetworkRuleSetWithServiceResponseAsync(resourceGroupName, namespaceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets 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<NetworkRuleSetInner> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName, final ServiceCallback<NetworkRuleSetInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkRuleSetWithServiceResponseAsync(resourceGroupName, namespaceName), serviceCallback);
+    }
+
+    /**
+     * Gets 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 NetworkRuleSetInner object
+     */
+    public Observable<NetworkRuleSetInner> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName) {
+        return getNetworkRuleSetWithServiceResponseAsync(resourceGroupName, namespaceName).map(new Func1<ServiceResponse<NetworkRuleSetInner>, NetworkRuleSetInner>() {
+            @Override
+            public NetworkRuleSetInner call(ServiceResponse<NetworkRuleSetInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets 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 NetworkRuleSetInner object
+     */
+    public Observable<ServiceResponse<NetworkRuleSetInner>> getNetworkRuleSetWithServiceResponseAsync(String resourceGroupName, 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.getNetworkRuleSet(resourceGroupName, namespaceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkRuleSetInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkRuleSetInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkRuleSetInner> clientResponse = getNetworkRuleSetDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkRuleSetInner> getNetworkRuleSetDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkRuleSetInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkRuleSetInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<EHNamespaceInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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<EHNamespaceInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<EHNamespaceInner>> serviceFuture, final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all the available Namespaces within a subscription, irrespective of the resource groups.
+     *
+    ServiceResponse<PageImpl<EHNamespaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;EHNamespaceInner&gt; object if successful.
+     */
+    public PagedList<EHNamespaceInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<EHNamespaceInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<EHNamespaceInner>(response.body()) {
+            @Override
+            public Page<EHNamespaceInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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<EHNamespaceInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<EHNamespaceInner>> serviceFuture, final ListOperationCallback<EHNamespaceInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<Page<EHNamespaceInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Page<EHNamespaceInner>>() {
+                @Override
+                public Page<EHNamespaceInner> call(ServiceResponse<Page<EHNamespaceInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+     * @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;EHNamespaceInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<EHNamespaceInner>>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(ServiceResponse<Page<EHNamespaceInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the available Namespaces within a resource group.
+     *
+    ServiceResponse<PageImpl<EHNamespaceInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;EHNamespaceInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<EHNamespaceInner>>> listByResourceGroupNextSinglePageAsync(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.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<EHNamespaceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<EHNamespaceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<EHNamespaceInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<EHNamespaceInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<EHNamespaceInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<EHNamespaceInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<EHNamespaceInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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;IpFilterRuleInner&gt; object if successful.
+     */
+    public PagedList<IpFilterRuleInner> listIPFilterRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<IpFilterRuleInner>> response = listIPFilterRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<IpFilterRuleInner>(response.body()) {
+            @Override
+            public Page<IpFilterRuleInner> nextPage(String nextPageLink) {
+                return listIPFilterRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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<IpFilterRuleInner>> listIPFilterRulesNextAsync(final String nextPageLink, final ServiceFuture<List<IpFilterRuleInner>> serviceFuture, final ListOperationCallback<IpFilterRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listIPFilterRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<IpFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpFilterRuleInner>>> call(String nextPageLink) {
+                    return listIPFilterRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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;IpFilterRuleInner&gt; object
+     */
+    public Observable<Page<IpFilterRuleInner>> listIPFilterRulesNextAsync(final String nextPageLink) {
+        return listIPFilterRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<IpFilterRuleInner>>, Page<IpFilterRuleInner>>() {
+                @Override
+                public Page<IpFilterRuleInner> call(ServiceResponse<Page<IpFilterRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of IP Filter rules 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;IpFilterRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<IpFilterRuleInner>>> listIPFilterRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listIPFilterRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<IpFilterRuleInner>>, Observable<ServiceResponse<Page<IpFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpFilterRuleInner>>> call(ServiceResponse<Page<IpFilterRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listIPFilterRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of IP Filter rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<IpFilterRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;IpFilterRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<IpFilterRuleInner>>> listIPFilterRulesNextSinglePageAsync(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.listIPFilterRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<IpFilterRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<IpFilterRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<IpFilterRuleInner>> result = listIPFilterRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<IpFilterRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<IpFilterRuleInner>> listIPFilterRulesNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<IpFilterRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<IpFilterRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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;VirtualNetworkRuleInner&gt; object if successful.
+     */
+    public PagedList<VirtualNetworkRuleInner> listVirtualNetworkRulesNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualNetworkRuleInner>> response = listVirtualNetworkRulesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualNetworkRuleInner>(response.body()) {
+            @Override
+            public Page<VirtualNetworkRuleInner> nextPage(String nextPageLink) {
+                return listVirtualNetworkRulesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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<VirtualNetworkRuleInner>> listVirtualNetworkRulesNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualNetworkRuleInner>> serviceFuture, final ListOperationCallback<VirtualNetworkRuleInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listVirtualNetworkRulesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(String nextPageLink) {
+                    return listVirtualNetworkRulesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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;VirtualNetworkRuleInner&gt; object
+     */
+    public Observable<Page<VirtualNetworkRuleInner>> listVirtualNetworkRulesNextAsync(final String nextPageLink) {
+        return listVirtualNetworkRulesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualNetworkRuleInner>>, Page<VirtualNetworkRuleInner>>() {
+                @Override
+                public Page<VirtualNetworkRuleInner> call(ServiceResponse<Page<VirtualNetworkRuleInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules 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;VirtualNetworkRuleInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> listVirtualNetworkRulesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listVirtualNetworkRulesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualNetworkRuleInner>>, Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(ServiceResponse<Page<VirtualNetworkRuleInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listVirtualNetworkRulesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of VirtualNetwork rules for a Namespace.
+     *
+    ServiceResponse<PageImpl<VirtualNetworkRuleInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualNetworkRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> listVirtualNetworkRulesNextSinglePageAsync(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.listVirtualNetworkRulesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualNetworkRuleInner>> result = listVirtualNetworkRulesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualNetworkRuleInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualNetworkRuleInner>> listVirtualNetworkRulesNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualNetworkRuleInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualNetworkRuleInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetImpl.java
new file mode 100644
index 000000000000..93b0c1d6bfb9
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetImpl.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NetworkRuleSet;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.DefaultAction;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetIpRules;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetVirtualNetworkRules;
+
+class NetworkRuleSetImpl extends WrapperImpl<NetworkRuleSetInner> implements NetworkRuleSet {
+    private final EventHubManager manager;
+    NetworkRuleSetImpl(NetworkRuleSetInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public DefaultAction defaultAction() {
+        return this.inner().defaultAction();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<NWRuleSetIpRules> ipRules() {
+        return this.inner().ipRules();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public List<NWRuleSetVirtualNetworkRules> virtualNetworkRules() {
+        return this.inner().virtualNetworkRules();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetInner.java
new file mode 100644
index 000000000000..ab6d0fa5645f
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetInner.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.DefaultAction;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetVirtualNetworkRules;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetIpRules;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Description of topic resource.
+ */
+@JsonFlatten
+public class NetworkRuleSetInner extends ProxyResource {
+    /**
+     * Default Action for Network Rule Set. Possible values include: 'Allow',
+     * 'Deny'.
+     */
+    @JsonProperty(value = "properties.defaultAction")
+    private DefaultAction defaultAction;
+
+    /**
+     * List VirtualNetwork Rules.
+     */
+    @JsonProperty(value = "properties.virtualNetworkRules")
+    private List<NWRuleSetVirtualNetworkRules> virtualNetworkRules;
+
+    /**
+     * List of IpRules.
+     */
+    @JsonProperty(value = "properties.ipRules")
+    private List<NWRuleSetIpRules> ipRules;
+
+    /**
+     * Get default Action for Network Rule Set. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the defaultAction value
+     */
+    public DefaultAction defaultAction() {
+        return this.defaultAction;
+    }
+
+    /**
+     * Set default Action for Network Rule Set. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param defaultAction the defaultAction value to set
+     * @return the NetworkRuleSetInner object itself.
+     */
+    public NetworkRuleSetInner withDefaultAction(DefaultAction defaultAction) {
+        this.defaultAction = defaultAction;
+        return this;
+    }
+
+    /**
+     * Get list VirtualNetwork Rules.
+     *
+     * @return the virtualNetworkRules value
+     */
+    public List<NWRuleSetVirtualNetworkRules> virtualNetworkRules() {
+        return this.virtualNetworkRules;
+    }
+
+    /**
+     * Set list VirtualNetwork Rules.
+     *
+     * @param virtualNetworkRules the virtualNetworkRules value to set
+     * @return the NetworkRuleSetInner object itself.
+     */
+    public NetworkRuleSetInner withVirtualNetworkRules(List<NWRuleSetVirtualNetworkRules> virtualNetworkRules) {
+        this.virtualNetworkRules = virtualNetworkRules;
+        return this;
+    }
+
+    /**
+     * Get list of IpRules.
+     *
+     * @return the ipRules value
+     */
+    public List<NWRuleSetIpRules> ipRules() {
+        return this.ipRules;
+    }
+
+    /**
+     * Set list of IpRules.
+     *
+     * @param ipRules the ipRules value to set
+     * @return the NetworkRuleSetInner object itself.
+     */
+    public NetworkRuleSetInner withIpRules(List<NWRuleSetIpRules> ipRules) {
+        this.ipRules = ipRules;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetsImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetsImpl.java
new file mode 100644
index 000000000000..9dd6895ba446
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetsImpl.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NetworkRuleSets;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.DefaultAction;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetIpRules;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetVirtualNetworkRules;
+
+class NetworkRuleSetsImpl extends WrapperImpl<NetworkRuleSetsInner> implements NetworkRuleSets {
+    private final EventHubManager manager;
+    NetworkRuleSetsImpl(NetworkRuleSetsInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public DefaultAction defaultAction() {
+        return this.inner().defaultAction();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public List<NWRuleSetIpRules> ipRules() {
+        return this.inner().ipRules();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public List<NWRuleSetVirtualNetworkRules> virtualNetworkRules() {
+        return this.inner().virtualNetworkRules();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetsInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetsInner.java
new file mode 100644
index 000000000000..e5777f902a84
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/NetworkRuleSetsInner.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.DefaultAction;
+import java.util.List;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetVirtualNetworkRules;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.NWRuleSetIpRules;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Description of topic resource.
+ */
+@JsonFlatten
+public class NetworkRuleSetsInner extends ProxyResource {
+    /**
+     * Default Action for Network Rule Set. Possible values include: 'Allow',
+     * 'Deny'.
+     */
+    @JsonProperty(value = "properties.defaultAction")
+    private DefaultAction defaultAction;
+
+    /**
+     * List VirtualNetwork Rules.
+     */
+    @JsonProperty(value = "properties.virtualNetworkRules")
+    private List<NWRuleSetVirtualNetworkRules> virtualNetworkRules;
+
+    /**
+     * List of IpRules.
+     */
+    @JsonProperty(value = "properties.ipRules")
+    private List<NWRuleSetIpRules> ipRules;
+
+    /**
+     * Get default Action for Network Rule Set. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the defaultAction value
+     */
+    public DefaultAction defaultAction() {
+        return this.defaultAction;
+    }
+
+    /**
+     * Set default Action for Network Rule Set. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param defaultAction the defaultAction value to set
+     * @return the NetworkRuleSetsInner object itself.
+     */
+    public NetworkRuleSetsInner withDefaultAction(DefaultAction defaultAction) {
+        this.defaultAction = defaultAction;
+        return this;
+    }
+
+    /**
+     * Get list VirtualNetwork Rules.
+     *
+     * @return the virtualNetworkRules value
+     */
+    public List<NWRuleSetVirtualNetworkRules> virtualNetworkRules() {
+        return this.virtualNetworkRules;
+    }
+
+    /**
+     * Set list VirtualNetwork Rules.
+     *
+     * @param virtualNetworkRules the virtualNetworkRules value to set
+     * @return the NetworkRuleSetsInner object itself.
+     */
+    public NetworkRuleSetsInner withVirtualNetworkRules(List<NWRuleSetVirtualNetworkRules> virtualNetworkRules) {
+        this.virtualNetworkRules = virtualNetworkRules;
+        return this;
+    }
+
+    /**
+     * Get list of IpRules.
+     *
+     * @return the ipRules value
+     */
+    public List<NWRuleSetIpRules> ipRules() {
+        return this.ipRules;
+    }
+
+    /**
+     * Set list of IpRules.
+     *
+     * @param ipRules the ipRules value to set
+     * @return the NetworkRuleSetsInner object itself.
+     */
+    public NetworkRuleSetsInner withIpRules(List<NWRuleSetIpRules> ipRules) {
+        this.ipRules = ipRules;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationImpl.java
new file mode 100644
index 000000000000..63dbb93c1997
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Operation;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.OperationDisplay;
+
+class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
+    private final EventHubManager manager;
+    OperationImpl(OperationInner inner, EventHubManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public OperationDisplay display() {
+        return this.inner().display();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationInner.java
new file mode 100644
index 000000000000..ef64b9205815
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationInner.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.OperationDisplay;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Event Hub REST API operation.
+ */
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The object that represents the operation.
+     */
+    @JsonProperty(value = "display")
+    private OperationDisplay display;
+
+    /**
+     * Get operation name: {provider}/{resource}/{operation}.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the object that represents the operation.
+     *
+     * @return the display value
+     */
+    public OperationDisplay display() {
+        return this.display;
+    }
+
+    /**
+     * Set the object that represents the operation.
+     *
+     * @param display the display value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withDisplay(OperationDisplay display) {
+        this.display = display;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationsImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationsImpl.java
new file mode 100644
index 000000000000..d7e0ed334b71
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationsImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Operations;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.Operation;
+
+class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
+    private final EventHubManager manager;
+
+    OperationsImpl(EventHubManager manager) {
+        super(manager.inner().operations());
+        this.manager = manager;
+    }
+
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<Operation> listAsync() {
+        OperationsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<OperationInner>, Iterable<OperationInner>>() {
+            @Override
+            public Iterable<OperationInner> call(Page<OperationInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<OperationInner, Operation>() {
+            @Override
+            public Operation call(OperationInner inner) {
+                return new OperationImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationsInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationsInner.java
new file mode 100644
index 000000000000..adf5624e7148
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/OperationsInner.java
@@ -0,0 +1,283 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Operations.
+ */
+public class OperationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private OperationsService service;
+    /** The service client containing this operation class. */
+    private EventHub2018PreviewManagementClientImpl client;
+
+    /**
+     * Initializes an instance of OperationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public OperationsInner(Retrofit retrofit, EventHub2018PreviewManagementClientImpl client) {
+        this.service = retrofit.create(OperationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Operations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface OperationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2018_01_01_preview.Operations list" })
+        @GET("providers/Microsoft.EventHub/operations")
+        Observable<Response<ResponseBody>> list(@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.eventhub.v2018_01_01_preview.Operations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> list() {
+        ServiceResponse<Page<OperationInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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<OperationInner>> listAsync(final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listSinglePageAsync() {
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.list(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<OperationInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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<OperationInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<OperationInner>> serviceFuture, final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+     * @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;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Event Hub REST API operations.
+     *
+    ServiceResponse<PageImpl<OperationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listNextSinglePageAsync(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.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/PageImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/PageImpl.java
new file mode 100644
index 000000000000..e0be9dc19808
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/PageImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/VirtualNetworkRuleImpl.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/VirtualNetworkRuleImpl.java
new file mode 100644
index 000000000000..ce4ee0baaf28
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/VirtualNetworkRuleImpl.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.VirtualNetworkRule;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+
+class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule, VirtualNetworkRuleInner, VirtualNetworkRuleImpl> implements VirtualNetworkRule, VirtualNetworkRule.Definition, VirtualNetworkRule.Update {
+    private final EventHubManager manager;
+    private String resourceGroupName;
+    private String namespaceName;
+    private String virtualNetworkRuleName;
+
+    VirtualNetworkRuleImpl(String name, EventHubManager manager) {
+        super(name, new VirtualNetworkRuleInner());
+        this.manager = manager;
+        // Set resource name
+        this.virtualNetworkRuleName = name;
+        //
+    }
+
+    VirtualNetworkRuleImpl(VirtualNetworkRuleInner inner, EventHubManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.virtualNetworkRuleName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
+        this.virtualNetworkRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualnetworkrules");
+        //
+    }
+
+    @Override
+    public EventHubManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<VirtualNetworkRule> createResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateVirtualNetworkRuleAsync(this.resourceGroupName, this.namespaceName, this.virtualNetworkRuleName)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<VirtualNetworkRule> updateResourceAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.createOrUpdateVirtualNetworkRuleAsync(this.resourceGroupName, this.namespaceName, this.virtualNetworkRuleName)
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<VirtualNetworkRuleInner> getInnerAsync() {
+        NamespacesInner client = this.manager().inner().namespaces();
+        return client.getVirtualNetworkRuleAsync(this.resourceGroupName, this.namespaceName, this.virtualNetworkRuleName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public String virtualNetworkSubnetId() {
+        return this.inner().virtualNetworkSubnetId();
+    }
+
+    @Override
+    public VirtualNetworkRuleImpl withExistingNamespace(String resourceGroupName, String namespaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.namespaceName = namespaceName;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/VirtualNetworkRuleInner.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/VirtualNetworkRuleInner.java
new file mode 100644
index 000000000000..010f8dc4205d
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/VirtualNetworkRuleInner.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Single item in a List or Get VirtualNetworkRules operation.
+ */
+@JsonFlatten
+public class VirtualNetworkRuleInner extends ProxyResource {
+    /**
+     * ARM ID of Virtual Network Subnet.
+     */
+    @JsonProperty(value = "properties.virtualNetworkSubnetId")
+    private String virtualNetworkSubnetId;
+
+    /**
+     * Get aRM ID of Virtual Network Subnet.
+     *
+     * @return the virtualNetworkSubnetId value
+     */
+    public String virtualNetworkSubnetId() {
+        return this.virtualNetworkSubnetId;
+    }
+
+    /**
+     * Set aRM ID of Virtual Network Subnet.
+     *
+     * @param virtualNetworkSubnetId the virtualNetworkSubnetId value to set
+     * @return the VirtualNetworkRuleInner object itself.
+     */
+    public VirtualNetworkRuleInner withVirtualNetworkSubnetId(String virtualNetworkSubnetId) {
+        this.virtualNetworkSubnetId = virtualNetworkSubnetId;
+        return this;
+    }
+
+}
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/package-info.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/package-info.java
new file mode 100644
index 000000000000..cea0031f4a2b
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the implementation classes for EventHub2018PreviewManagementClient.
+ * Azure Event Hubs client for managing Event Hubs Cluster, IPFilter Rules and VirtualNetworkRules resources.
+ */
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
diff --git a/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/package-info.java b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/package-info.java
new file mode 100644
index 000000000000..a8ed68f4eb2f
--- /dev/null
+++ b/eventhub/resource-manager/v2018_01_01_preview/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the classes for EventHub2018PreviewManagementClient.
+ * Azure Event Hubs client for managing Event Hubs Cluster, IPFilter Rules and VirtualNetworkRules resources.
+ */
+package com.microsoft.azure.management.eventhub.v2018_01_01_preview;